project: rev 199

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("jy")
+@ObfuscatedName("kk")
 @Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Loj;"
+		descriptor = "Lpk;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("al")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -53448723
+		intValue = -256520341
 	)
-	static int field3591;
-	@ObfuscatedName("k")
+	static int field3717;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 964693835
+		intValue = 971351999
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lod;"
+		descriptor = "Lpn;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("c")
+	@ObfuscatedName("j")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("m")
+	@ObfuscatedName("b")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("z")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "[Lod;"
+		descriptor = "[Lpn;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("y")
+	@ObfuscatedName("w")
 	@Export("files")
 	Object[][] files;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 378032211
+		intValue = 1610295251
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ad")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("am")
+	@ObfuscatedName("al")
 	@Export("shallowFiles")
 	boolean shallowFiles;
 
 	static {
 		gzipDecompressor = new GZipDecompressor();
-		field3591 = 0;
+		field3717 = 0;
 	}
 
 	AbstractArchive(boolean var1, boolean var2) {
@@ -86,159 +86,161 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1300418650"
+		garbageValue = "-2091662217"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
+		descriptor = "(II)V",
+		garbageValue = "16776960"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "-50"
+		descriptor = "(II)I",
+		garbageValue = "73945928"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		return this.groups[var1] != null ? 100 : 0;
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "1823098736"
+		garbageValue = "309174384"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
-		this.hash = PacketBufferNode.method4418(var1, var1.length);
-		Buffer var2 = new Buffer(GrandExchangeOfferOwnWorldComparator.decompressBytes(var1));
-		int var3 = var2.readUnsignedByte();
-		if (var3 >= 5 && var3 <= 7) {
-			if (var3 >= 6) {
-				var2.readInt();
+		int var3 = var1.length;
+		int var2 = Ignored.method6065(var1, 0, var3);
+		this.hash = var2;
+		Buffer var4 = new Buffer(class134.decompressBytes(var1));
+		int var5 = var4.readUnsignedByte();
+		if (var5 >= 5 && var5 <= 7) {
+			if (var5 >= 6) {
+				var4.readInt();
 			}
 
-			int var4 = var2.readUnsignedByte();
-			if (var3 >= 7) {
-				this.groupCount = var2.method6838();
+			int var6 = var4.readUnsignedByte();
+			if (var5 >= 7) {
+				this.groupCount = var4.method6831();
 			} else {
-				this.groupCount = var2.readUnsignedShort();
+				this.groupCount = var4.readUnsignedShort();
 			}
 
-			int var5 = 0;
-			int var6 = -1;
+			int var7 = 0;
+			int var8 = -1;
 			this.groupIds = new int[this.groupCount];
-			int var7;
-			if (var3 >= 7) {
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupIds[var7] = var5 += var2.method6838();
-					if (this.groupIds[var7] > var6) {
-						var6 = this.groupIds[var7];
+			int var9;
+			if (var5 >= 7) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					this.groupIds[var9] = var7 += var4.method6831();
+					if (this.groupIds[var9] > var8) {
+						var8 = this.groupIds[var9];
 					}
 				}
 			} else {
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupIds[var7] = var5 += var2.readUnsignedShort();
-					if (this.groupIds[var7] > var6) {
-						var6 = this.groupIds[var7];
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					this.groupIds[var9] = var7 += var4.readUnsignedShort();
+					if (this.groupIds[var9] > var8) {
+						var8 = this.groupIds[var9];
 					}
 				}
 			}
 
-			this.groupCrcs = new int[var6 + 1];
-			this.groupVersions = new int[var6 + 1];
-			this.fileCounts = new int[var6 + 1];
-			this.fileIds = new int[var6 + 1][];
-			this.groups = new Object[var6 + 1];
-			this.files = new Object[var6 + 1][];
-			if (var4 != 0) {
-				this.groupNameHashes = new int[var6 + 1];
+			this.groupCrcs = new int[var8 + 1];
+			this.groupVersions = new int[var8 + 1];
+			this.fileCounts = new int[var8 + 1];
+			this.fileIds = new int[var8 + 1][];
+			this.groups = new Object[var8 + 1];
+			this.files = new Object[var8 + 1][];
+			if (var6 != 0) {
+				this.groupNameHashes = new int[var8 + 1];
 
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					this.groupNameHashes[this.groupIds[var9]] = var4.readInt();
 				}
 
 				this.groupNameHashTable = new IntHashTable(this.groupNameHashes);
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) {
-				this.groupCrcs[this.groupIds[var7]] = var2.readInt();
+			for (var9 = 0; var9 < this.groupCount; ++var9) {
+				this.groupCrcs[this.groupIds[var9]] = var4.readInt();
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) {
-				this.groupVersions[this.groupIds[var7]] = var2.readInt();
+			for (var9 = 0; var9 < this.groupCount; ++var9) {
+				this.groupVersions[this.groupIds[var9]] = var4.readInt();
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) {
-				this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
+			for (var9 = 0; var9 < this.groupCount; ++var9) {
+				this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort();
 			}
 
-			int var8;
-			int var9;
 			int var10;
 			int var11;
 			int var12;
-			if (var3 >= 7) {
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					var8 = this.groupIds[var7];
-					var9 = this.fileCounts[var8];
-					var5 = 0;
-					var10 = -1;
-					this.fileIds[var8] = new int[var9];
+			int var13;
+			int var14;
+			if (var5 >= 7) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					var10 = this.groupIds[var9];
+					var11 = this.fileCounts[var10];
+					var7 = 0;
+					var12 = -1;
+					this.fileIds[var10] = new int[var11];
 
-					for (var11 = 0; var11 < var9; ++var11) {
-						var12 = this.fileIds[var8][var11] = var5 += var2.method6838();
-						if (var12 > var10) {
-							var10 = var12;
+					for (var13 = 0; var13 < var11; ++var13) {
+						var14 = this.fileIds[var10][var13] = var7 += var4.method6831();
+						if (var14 > var12) {
+							var12 = var14;
 						}
 					}
 
-					this.files[var8] = new Object[var10 + 1];
+					this.files[var10] = new Object[var12 + 1];
 				}
 			} else {
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					var8 = this.groupIds[var7];
-					var9 = this.fileCounts[var8];
-					var5 = 0;
-					var10 = -1;
-					this.fileIds[var8] = new int[var9];
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					var10 = this.groupIds[var9];
+					var11 = this.fileCounts[var10];
+					var7 = 0;
+					var12 = -1;
+					this.fileIds[var10] = new int[var11];
 
-					for (var11 = 0; var11 < var9; ++var11) {
-						var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort();
-						if (var12 > var10) {
-							var10 = var12;
+					for (var13 = 0; var13 < var11; ++var13) {
+						var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort();
+						if (var14 > var12) {
+							var12 = var14;
 						}
 					}
 
-					this.files[var8] = new Object[var10 + 1];
+					this.files[var10] = new Object[var12 + 1];
 				}
 			}
 
-			if (var4 != 0) {
-				this.fileNameHashes = new int[var6 + 1][];
-				this.fileNameHashTables = new IntHashTable[var6 + 1];
+			if (var6 != 0) {
+				this.fileNameHashes = new int[var8 + 1][];
+				this.fileNameHashTables = new IntHashTable[var8 + 1];
 
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					var8 = this.groupIds[var7];
-					var9 = this.fileCounts[var8];
-					this.fileNameHashes[var8] = new int[this.files[var8].length];
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					var10 = this.groupIds[var9];
+					var11 = this.fileCounts[var10];
+					this.fileNameHashes[var10] = new int[this.files[var10].length];
 
-					for (var10 = 0; var10 < var9; ++var10) {
-						this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
+					for (var12 = 0; var12 < var11; ++var12) {
+						this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt();
 					}
 
-					this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]);
+					this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]);
 				}
 			}
 
@@ -247,20 +249,20 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(III)[B",
-		garbageValue = "-1913425709"
+		descriptor = "(IIB)[B",
+		garbageValue = "1"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
 		return this.takeFileEncrypted(var1, var2, (int[])null);
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "(II[IB)[B",
-		garbageValue = "9"
+		descriptor = "(II[II)[B",
+		garbageValue = "-1400287968"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
@@ -276,7 +278,7 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var5 = MusicPatchNode.method4683(this.files[var1][var2], false);
+			byte[] var5 = ObjectComposition.method3159(this.files[var1][var2], false);
 			if (this.shallowFiles) {
 				this.files[var1][var2] = null;
 			}
@@ -287,10 +289,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
-		garbageValue = "-1899581217"
+		descriptor = "(IIB)Z",
+		garbageValue = "14"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
@@ -308,12 +310,12 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(IS)Z",
-		garbageValue = "1775"
+		descriptor = "(II)Z",
+		garbageValue = "-1235242527"
 	)
-	public boolean method5025(int var1) {
+	public boolean method5156(int var1) {
 		if (this.files.length == 1) {
 			return this.tryLoadFile(0, var1);
 		} else if (this.files[var1].length == 1) {
@@ -323,10 +325,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(IS)Z",
-		garbageValue = "2421"
+		descriptor = "(IB)Z",
+		garbageValue = "6"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
@@ -338,10 +340,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "109860486"
+		garbageValue = "-1938469989"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
@@ -360,10 +362,10 @@ public abstract class AbstractArchive {
 		return var1;
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
 		descriptor = "(II)[B",
-		garbageValue = "-2038224126"
+		garbageValue = "1970819386"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
@@ -376,10 +378,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
 		descriptor = "(III)[B",
-		garbageValue = "-2031467917"
+		garbageValue = "-195653107"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
@@ -395,17 +397,17 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var4 = MusicPatchNode.method4683(this.files[var1][var2], false);
+			byte[] var4 = ObjectComposition.method3159(this.files[var1][var2], false);
 			return var4;
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "(IS)[B",
-		garbageValue = "31367"
+		descriptor = "(II)[B",
+		garbageValue = "-2089427663"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
@@ -418,40 +420,40 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("bl")
 	@ObfuscatedSignature(
 		descriptor = "(II)[I",
-		garbageValue = "1157862093"
+		garbageValue = "1156606106"
 	)
 	@Export("getGroupFileIds")
 	public int[] getGroupFileIds(int var1) {
 		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null;
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "108747634"
+		garbageValue = "-628492237"
 	)
 	@Export("getGroupFileCount")
 	public int getGroupFileCount(int var1) {
 		return this.files[var1].length;
 	}
 
-	@ObfuscatedName("bk")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-697151227"
+		garbageValue = "-1203750682"
 	)
 	@Export("getGroupCount")
 	public int getGroupCount() {
 		return this.files.length;
 	}
 
-	@ObfuscatedName("br")
+	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "55"
+		descriptor = "(I)V",
+		garbageValue = "2078334330"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
@@ -461,10 +463,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("by")
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1610512339"
+		garbageValue = "-1819838440"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
@@ -474,10 +476,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-6"
+		garbageValue = "1"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
@@ -491,10 +493,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("be")
 	@ObfuscatedSignature(
-		descriptor = "(I[IB)Z",
-		garbageValue = "-1"
+		descriptor = "(I[II)Z",
+		garbageValue = "1799512695"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
@@ -516,29 +518,28 @@ public abstract class AbstractArchive {
 			if (var6) {
 				return true;
 			} else {
-				byte[] var21;
+				byte[] var18;
 				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
-					var21 = MusicPatchNode.method4683(this.groups[var1], false);
+					var18 = ObjectComposition.method3159(this.groups[var1], false);
 				} else {
-					var21 = MusicPatchNode.method4683(this.groups[var1], true);
-					Buffer var8 = new Buffer(var21);
+					var18 = ObjectComposition.method3159(this.groups[var1], true);
+					Buffer var8 = new Buffer(var18);
 					var8.xteaDecrypt(var2, 5, var8.array.length);
 				}
 
-				byte[] var25 = GrandExchangeOfferOwnWorldComparator.decompressBytes(var21);
+				byte[] var20 = class134.decompressBytes(var18);
 				if (this.releaseGroups) {
 					this.groups[var1] = null;
 				}
 
-				int var10;
 				if (var3 > 1) {
-					int var22 = var25.length;
-					--var22;
-					var10 = var25[var22] & 255;
-					var22 -= var10 * var3 * 4;
-					Buffer var11 = new Buffer(var25);
+					int var9 = var20.length;
+					--var9;
+					int var10 = var20[var9] & 255;
+					var9 -= var3 * var10 * 4;
+					Buffer var11 = new Buffer(var20);
 					int[] var12 = new int[var3];
-					var11.offset = var22;
+					var11.offset = var9;
 
 					int var14;
 					int var15;
@@ -551,64 +552,38 @@ public abstract class AbstractArchive {
 						}
 					}
 
-					byte[][] var23 = new byte[var3][];
+					byte[][] var19 = new byte[var3][];
 
 					for (var14 = 0; var14 < var3; ++var14) {
-						var23[var14] = new byte[var12[var14]];
+						var19[var14] = new byte[var12[var14]];
 						var12[var14] = 0;
 					}
 
-					var11.offset = var22;
+					var11.offset = var9;
 					var14 = 0;
 
-					int var17;
 					for (var15 = 0; var15 < var10; ++var15) {
-						int var24 = 0;
+						int var16 = 0;
 
-						for (var17 = 0; var17 < var3; ++var17) {
-							var24 += var11.readInt();
-							System.arraycopy(var25, var14, var23[var17], var12[var17], var24);
-							var12[var17] += var24;
-							var14 += var24;
+						for (int var17 = 0; var17 < var3; ++var17) {
+							var16 += var11.readInt();
+							System.arraycopy(var20, var14, var19[var17], var12[var17], var16);
+							var12[var17] += var16;
+							var14 += var16;
 						}
 					}
 
 					for (var15 = 0; var15 < var3; ++var15) {
 						if (!this.shallowFiles) {
-							var17 = var4[var15];
-							byte[] var19 = var23[var15];
-							Object var18;
-							if (var19 == null) {
-								var18 = null;
-							} else if (var19.length > 136) {
-								DirectByteArrayCopier var20 = new DirectByteArrayCopier();
-								var20.set(var19);
-								var18 = var20;
-							} else {
-								var18 = var19;
-							}
-
-							var5[var17] = var18;
+							var5[var4[var15]] = VertexNormal.method4476(var19[var15], false);
 						} else {
-							var5[var4[var15]] = var23[var15];
+							var5[var4[var15]] = var19[var15];
 						}
 					}
 				} else if (!this.shallowFiles) {
-					var10 = var4[0];
-					Object var26;
-					if (var25 == null) {
-						var26 = null;
-					} else if (var25.length > 136) {
-						DirectByteArrayCopier var27 = new DirectByteArrayCopier();
-						var27.set(var25);
-						var26 = var27;
-					} else {
-						var26 = var25;
-					}
-
-					var5[var10] = var26;
+					var5[var4[0]] = VertexNormal.method4476(var20, false);
 				} else {
-					var5[var4[0]] = var25;
+					var5[var4[0]] = var20;
 				}
 
 				return true;
@@ -616,109 +591,109 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-2121805494"
+		garbageValue = "69048727"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
 		var1 = var1.toLowerCase();
-		return this.groupNameHashTable.get(GameEngine.hashString(var1));
+		return this.groupNameHashTable.get(CollisionMap.hashString(var1));
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bu")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)I",
-		garbageValue = "59"
+		descriptor = "(ILjava/lang/String;I)I",
+		garbageValue = "947242826"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
 		var2 = var2.toLowerCase();
-		return this.fileNameHashTables[var1].get(GameEngine.hashString(var2));
+		return this.fileNameHashTables[var1].get(CollisionMap.hashString(var2));
 	}
 
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z",
-		garbageValue = "59"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
+		garbageValue = "1222841488"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1));
+		int var3 = this.groupNameHashTable.get(CollisionMap.hashString(var1));
 		if (var3 < 0) {
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2));
+			int var4 = this.fileNameHashTables[var3].get(CollisionMap.hashString(var2));
 			return var4 >= 0;
 		}
 	}
 
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B",
-		garbageValue = "318235535"
+		garbageValue = "-1075732024"
 	)
 	@Export("takeFileByNames")
 	public byte[] takeFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2));
+		int var3 = this.groupNameHashTable.get(CollisionMap.hashString(var1));
+		int var4 = this.fileNameHashTables[var3].get(CollisionMap.hashString(var2));
 		return this.takeFile(var3, var4);
 	}
 
 	@ObfuscatedName("bm")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "-997373263"
+		garbageValue = "-1616955064"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2));
+		int var3 = this.groupNameHashTable.get(CollisionMap.hashString(var1));
+		int var4 = this.fileNameHashTables[var3].get(CollisionMap.hashString(var2));
 		return this.tryLoadFile(var3, var4);
 	}
 
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)Z",
-		garbageValue = "1"
+		descriptor = "(Ljava/lang/String;I)Z",
+		garbageValue = "-802511853"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1));
+		int var2 = this.groupNameHashTable.get(CollisionMap.hashString(var1));
 		return this.tryLoadGroup(var2);
 	}
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1368245074"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "1"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1));
+		int var2 = this.groupNameHashTable.get(CollisionMap.hashString(var1));
 		if (var2 >= 0) {
 			this.loadRegionFromGroup(var2);
 		}
 	}
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "1304244240"
+		descriptor = "(Ljava/lang/String;S)I",
+		garbageValue = "254"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1));
+		int var2 = this.groupNameHashTable.get(CollisionMap.hashString(var1));
 		return this.groupLoadPercent(var2);
 	}
 }

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

@@ -3,101 +3,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ig")
+@ObfuscatedName("jp")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "124"
+		descriptor = "(S)[B",
+		garbageValue = "147"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "([BI)V",
-		garbageValue = "138258898"
+		descriptor = "([BS)V",
+		garbageValue = "2048"
 	)
 	@Export("set")
-	public abstract void set(byte[] var1);
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1662367088"
-	)
-	public static void method4860() {
-		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
-	}
-
-	@ObfuscatedName("hj")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "188753094"
-	)
-	static final void method4858() {
-		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 || class127.method2561(var0.objectId, var0.field1009)) {
-					Renderable.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1012, var0.field1009);
-					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) {
-					if (var0.id >= 0) {
-						int var2 = var0.id;
-						int var3 = var0.field1016;
-						ObjectComposition var4 = ClanChannel.getObjectDefinition(var2);
-						if (var3 == 11) {
-							var3 = 10;
-						}
-
-						if (var3 >= 5 && var3 <= 8) {
-							var3 = 4;
-						}
-
-						boolean var1 = var4.method2993(var3);
-						if (!var1) {
-							continue;
-						}
-					}
-
-					Renderable.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1016);
-					var0.delay = -1;
-					if (var0.objectId == var0.id && var0.objectId == -1) {
-						var0.remove();
-					} else if (var0.objectId == var0.id && var0.field1012 == var0.orientation && var0.field1009 == var0.field1016) {
-						var0.remove();
-					}
-				}
-			}
-		}
-
-	}
-
-	@ObfuscatedName("ko")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1787819457"
-	)
-	@Export("FriendSystem_invalidateIgnoreds")
-	static final void FriendSystem_invalidateIgnoreds() {
-		class171.method3555();
-		if (MouseRecorder.friendsChat != null) {
-			MouseRecorder.friendsChat.invalidateIgnoreds();
-		}
-
-	}
+	abstract void set(byte[] var1);
 }

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("kb")
+@ObfuscatedName("ll")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "[Lof;"
+		descriptor = "[Loi;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("c")
+	@ObfuscatedName("j")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("m")
+	@ObfuscatedName("b")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.readMetrics(var1);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@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)method5448(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5635(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}
 
-		return this.advances[ArchiveDiskActionHandler.charToByteCp1252(var1) & 255];
+		return this.advances[WorldMapSection2.charToByteCp1252(var1) & 255];
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) {
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var7.equals("gt")) {
 								if (var7.startsWith("img=")) {
 									try {
-										int var8 = NetCache.method5088(var7.substring(4));
+										int var8 = GrandExchangeOfferAgeComparator.method5303(var7.substring(4));
 										var4 += AbstractFont_modIconSprites[var8].width;
 										var3 = -1;
 									} catch (Exception var10) {
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 					}
 
 					if (var2 == -1) {
-						var4 += this.advances[(char)(ArchiveDiskActionHandler.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(WorldMapSection2.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("p")
+	@ObfuscatedName("y")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) {
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							var11 = '>';
 						} else if (var16.startsWith("img=")) {
 							try {
-								int var17 = NetCache.method5088(var16.substring(4));
+								int var17 = GrandExchangeOfferAgeComparator.method5303(var16.substring(4));
 								var4 += AbstractFont_modIconSprites[var17].width;
 								var11 = 0;
 							} catch (Exception var20) {
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -391,13 +391,30 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(IILjava/lang/String;II)Lmt;"
+	)
+	public Bounds method5657(int var1, int var2, String var3, int var4, int var5) {
+		if (var3 != null && var3.length() >= var2 + var1) {
+			int var6 = var4 - this.stringWidth(var3) / 2;
+			var6 += this.stringWidth(var3.substring(0, var1));
+			int var7 = var5 - this.maxAscent;
+			int var8 = this.stringWidth(var3.substring(var1, var2 + var1));
+			int var9 = this.maxAscent + this.maxDescent;
+			return new Bounds(var6, var7, var8, var9);
+		} else {
+			return new Bounds(var4, var5, 0, 0);
+		}
+	}
+
+	@ObfuscatedName("d")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -406,7 +423,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -416,7 +433,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -425,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -434,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@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) {
@@ -495,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("t")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -510,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -527,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) {
@@ -547,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("w")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -568,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,49 +599,41 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("aq")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
 			if (var1.startsWith("col=")) {
-				AbstractFont_color = class125.method2540(var1.substring(4), 16);
+				AbstractFont_color = class113.method2479(var1.substring(4), 16);
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
-			} else {
-				int var2;
-				String var3;
-				if (var1.startsWith("str=")) {
-					var3 = var1.substring(4);
-					var2 = ScriptFrame.method852(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=")) {
-					AbstractFont_underline = class125.method2540(var1.substring(2), 16);
-				} 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);
-					var2 = ScriptFrame.method852(var3, 16, true);
-					AbstractFont_shadow = var2;
-				} else if (var1.equals("shad")) {
-					AbstractFont_shadow = 0;
-				} else if (var1.equals("/shad")) {
-					AbstractFont_shadow = AbstractFont_previousShadow;
-				} else if (var1.equals("br")) {
-					this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
-				}
+			} else if (var1.startsWith("str=")) {
+				AbstractFont_strike = class113.method2479(var1.substring(4), 16);
+			} else if (var1.equals("str")) {
+				AbstractFont_strike = 8388608;
+			} else if (var1.equals("/str")) {
+				AbstractFont_strike = -1;
+			} else if (var1.startsWith("u=")) {
+				AbstractFont_underline = class113.method2479(var1.substring(2), 16);
+			} else if (var1.equals("u")) {
+				AbstractFont_underline = 0;
+			} else if (var1.equals("/u")) {
+				AbstractFont_underline = -1;
+			} else if (var1.startsWith("shad=")) {
+				AbstractFont_shadow = class113.method2479(var1.substring(5), 16);
+			} else if (var1.equals("shad")) {
+				AbstractFont_shadow = 0;
+			} else if (var1.equals("/shad")) {
+				AbstractFont_shadow = AbstractFont_previousShadow;
+			} else if (var1.equals("br")) {
+				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
 			}
-		} catch (Exception var5) {
+		} catch (Exception var3) {
 		}
 
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ad")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -647,7 +656,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -656,7 +665,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var6 = 0; var6 < var1.length(); ++var6) {
 			if (var1.charAt(var6) != 0) {
-				char var7 = (char)(ArchiveDiskActionHandler.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(WorldMapSection2.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -670,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) {
 								if (var8.startsWith("img=")) {
 									try {
-										var9 = NetCache.method5088(var8.substring(4));
+										var9 = GrandExchangeOfferAgeComparator.method5303(var8.substring(4));
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9];
 										var10.drawAt(var2, var3 + this.ascent - var10.height);
 										var2 += var10.width;
@@ -736,7 +745,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("aa")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -746,7 +755,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var9 = 0; var9 < var1.length(); ++var9) {
 			if (var1.charAt(var9) != 0) {
-				char var10 = (char)(ArchiveDiskActionHandler.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(WorldMapSection2.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -775,7 +784,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}
 
 										++var8;
-										var14 = NetCache.method5088(var11.substring(4));
+										var14 = GrandExchangeOfferAgeComparator.method5303(var11.substring(4));
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14];
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
 										var2 += var15.width;
@@ -854,8 +863,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("o")
-	static int method5448(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	@ObfuscatedName("u")
+	static int method5635(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];
@@ -890,7 +899,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length();
@@ -919,7 +928,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("aw")
 	@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;
@@ -961,7 +970,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("at")
 	@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);
@@ -1009,7 +1018,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("as")
 	@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;
@@ -1051,7 +1060,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ae")
 	@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,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ox")
+@ObfuscatedName("or")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -691531169
+		intValue = -1966708419
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1766666421
+		intValue = 1693777643
 	)
 	@Export("height")
 	public int height;
@@ -26,39 +26,29 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-13"
+		descriptor = "(III)V",
+		garbageValue = "286261249"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-984138546"
+		garbageValue = "-1489672411"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "45"
+		garbageValue = "-31"
 	)
 	@Export("apply")
 	public final void apply() {
 		Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height);
 	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "16"
-	)
-	public static void method7053() {
-		SpotAnimationDefinition.SpotAnimationDefinition_cached.clear();
-		SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear();
-	}
 }

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

@@ -1,77 +1,143 @@
 import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lp")
+@ObfuscatedName("mv")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
-	@ObfuscatedName("rz")
-	@ObfuscatedGetter(
-		intValue = 352918735
-	)
-	static int field3874;
-
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(S)V",
-		garbageValue = "-27454"
+		garbageValue = "4535"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1311148246"
+		descriptor = "(B)I",
+		garbageValue = "61"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "88"
+		descriptor = "(I)I",
+		garbageValue = "-1430321597"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-60"
+		descriptor = "(II)Z",
+		garbageValue = "823949627"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "1814286008"
+		garbageValue = "593938417"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "([BIIB)V",
-		garbageValue = "-30"
+		garbageValue = "-4"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "88"
+		descriptor = "(Lkk;Lkk;IIB)Llu;",
+		garbageValue = "0"
 	)
-	static void method5924() {
-		Login.loginIndex = 24;
-		Client.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", "");
+	public static Font method6107(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+		byte[] var5 = var0.takeFile(var2, var3);
+		boolean var4;
+		if (var5 == null) {
+			var4 = false;
+		} else {
+			class28.SpriteBuffer_decode(var5);
+			var4 = true;
+		}
+
+		return !var4 ? null : WorldMapArchiveLoader.method6348(var1.takeFile(var2, var3));
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(I)Loc;",
+		garbageValue = "-1227979841"
+	)
+	static SpritePixels method6108() {
+		SpritePixels var0 = new SpritePixels();
+		var0.width = class413.SpriteBuffer_spriteWidth;
+		var0.height = class413.SpriteBuffer_spriteHeight;
+		var0.xOffset = class413.SpriteBuffer_xOffsets[0];
+		var0.yOffset = class413.SpriteBuffer_yOffsets[0];
+		var0.subWidth = InvDefinition.SpriteBuffer_spriteWidths[0];
+		var0.subHeight = class413.SpriteBuffer_spriteHeights[0];
+		int var1 = var0.subHeight * var0.subWidth;
+		byte[] var2 = class283.SpriteBuffer_pixels[0];
+		var0.pixels = new int[var1];
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var0.pixels[var3] = ItemContainer.SpriteBuffer_spritePalette[var2[var3] & 255];
+		}
+
+		class413.SpriteBuffer_xOffsets = null;
+		class413.SpriteBuffer_yOffsets = null;
+		InvDefinition.SpriteBuffer_spriteWidths = null;
+		class413.SpriteBuffer_spriteHeights = null;
+		ItemContainer.SpriteBuffer_spritePalette = null;
+		class283.SpriteBuffer_pixels = null;
+		return var0;
+	}
+
+	@ObfuscatedName("jd")
+	@ObfuscatedSignature(
+		descriptor = "(Ljd;Lfy;IIZI)V",
+		garbageValue = "1327737191"
+	)
+	@Export("addWidgetItemMenuItem")
+	static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
+		String[] var5 = var1.inventoryActions;
+		byte var6 = -1;
+		String var7 = null;
+		if (var5 != null && var5[var3] != null) {
+			if (var3 == 0) {
+				var6 = 33;
+			} else if (var3 == 1) {
+				var6 = 34;
+			} else if (var3 == 2) {
+				var6 = 35;
+			} else if (var3 == 3) {
+				var6 = 36;
+			} else {
+				var6 = 37;
+			}
+
+			var7 = var5[var3];
+		} else if (var3 == 4) {
+			var6 = 37;
+			var7 = "Drop";
+		}
+
+		if (var6 != -1 && var7 != null) {
+			GrandExchangeEvents.insertMenuItem(var7, class54.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4);
+		}
+
 	}
 }

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

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

@@ -1,26 +1,26 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 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("ly")
+@ObfuscatedName("lc")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("n")
-	@Export("Interpreter_intLocals")
-	static int[] Interpreter_intLocals;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/Comparator;B)V",
-		garbageValue = "118"
+		descriptor = "(Ljava/util/Comparator;I)V",
+		garbageValue = "-1701811503"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -32,10 +32,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Llm;Llm;I)I",
-		garbageValue = "1954626737"
+		descriptor = "(Lle;Lle;S)I",
+		garbageValue = "161"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -46,17 +46,41 @@ public abstract class AbstractUserComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "427246269"
+		descriptor = "(B)V",
+		garbageValue = "115"
 	)
-	public static String method5813(CharSequence var0) {
-		String var1 = Varcs.base37DecodeLong(class287.method5201(var0));
-		if (var1 == null) {
-			var1 = "";
+	public static void method5977() {
+		try {
+			File var0 = new File(ItemContainer.userHomeDirectory, "random.dat");
+			int var2;
+			if (var0.exists()) {
+				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
+			} else {
+				label38:
+				for (int var1 = 0; var1 < ChatChannel.cacheSubPaths.length; ++var1) {
+					for (var2 = 0; var2 < Varcs.cacheParentPaths.length; ++var2) {
+						File var3 = new File(Varcs.cacheParentPaths[var2] + ChatChannel.cacheSubPaths[var1] + File.separatorChar + "random.dat");
+						if (var3.exists()) {
+							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
+							break label38;
+						}
+					}
+				}
+			}
+
+			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) {
 		}
 
-		return var1;
 	}
 }

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

@@ -5,108 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fk")
+@ObfuscatedName("gy")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 189428749
+		intValue = 355210745
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -443583549
+		intValue = 1471766729
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -2120803321
+		intValue = -801266965
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1865243023
+		intValue = 882284497
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 851664485
+		intValue = 1262038287
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1526795569
+		intValue = 1001361869
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 734373105
+		intValue = 1629652609
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1590073095
+		intValue = -2041641449
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("a")
-	byte[][][] field2056;
-	@ObfuscatedName("q")
-	byte[][][] field2057;
-	@ObfuscatedName("u")
+	@ObfuscatedName("s")
+	byte[][][] field2143;
+	@ObfuscatedName("h")
+	byte[][][] field2144;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "[[[[Lfl;"
+		descriptor = "[[[[Lgc;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("e")
-	boolean field2059;
-	@ObfuscatedName("c")
-	boolean field2055;
+	@ObfuscatedName("q")
+	boolean field2146;
+	@ObfuscatedName("j")
+	boolean field2147;
 
 	AbstractWorldMapData() {
 		this.groupId = -1;
 		this.fileId = -1;
 		new LinkedList();
-		this.field2059 = false;
-		this.field2055 = false;
+		this.field2146 = false;
+		this.field2147 = false;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;I)V",
-		garbageValue = "-1489554607"
+		descriptor = "(Lot;B)V",
+		garbageValue = "2"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-64"
+		garbageValue = "53"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field2059 && this.field2055;
+		return this.field2146 && this.field2147;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;I)V",
-		garbageValue = "-882466387"
+		descriptor = "(Lkk;I)V",
+		garbageValue = "-1354291694"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -114,53 +114,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
 			if (var2 != null) {
 				this.readGeography(new Buffer(var2));
-				this.field2059 = true;
-				this.field2055 = true;
+				this.field2146 = true;
+				this.field2147 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1710471414"
+		descriptor = "(B)V",
+		garbageValue = "-74"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null;
 		this.floorOverlayIds = null;
-		this.field2056 = null;
-		this.field2057 = null;
+		this.field2143 = null;
+		this.field2144 = null;
 		this.decorations = null;
-		this.field2059 = false;
-		this.field2055 = false;
+		this.field2146 = false;
+		this.field2147 = false;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(IILnv;B)V",
-		garbageValue = "80"
+		descriptor = "(IILot;B)V",
+		garbageValue = "59"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte();
 		if (var4 != 0) {
 			if ((var4 & 1) != 0) {
-				this.method3615(var1, var2, var3, var4);
+				this.method3776(var1, var2, var3, var4);
 			} else {
-				this.method3614(var1, var2, var3, var4);
+				this.method3777(var1, var2, var3, var4);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IILnv;II)V",
-		garbageValue = "-657714466"
+		descriptor = "(IILot;IB)V",
+		garbageValue = "0"
 	)
-	void method3615(int var1, int var2, Buffer var3, int var4) {
+	void method3776(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0;
 		if (var5) {
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
@@ -169,12 +169,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(IILnv;IB)V",
-		garbageValue = "127"
+		descriptor = "(IILot;IB)V",
+		garbageValue = "103"
 	)
-	void method3614(int var1, int var2, Buffer var3, int var4) {
+	void method3777(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1;
 		boolean var6 = (var4 & 2) != 0;
 		boolean var7 = (var4 & 4) != 0;
@@ -190,8 +190,8 @@ public abstract class AbstractWorldMapData {
 				if (var14 != 0) {
 					this.floorOverlayIds[var9][var1][var2] = (short)var14;
 					var11 = var3.readUnsignedByte();
-					this.field2056[var9][var1][var2] = (byte)(var11 >> 2);
-					this.field2057[var9][var1][var2] = (byte)(var11 & 3);
+					this.field2143[var9][var1][var2] = (byte)(var11 >> 2);
+					this.field2144[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -203,7 +203,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
 
 					for (var11 = 0; var11 < var9; ++var11) {
-						int var12 = var3.method6674();
+						int var12 = var3.method6985();
 						int var13 = var3.readUnsignedByte();
 						var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
 					}
@@ -213,23 +213,32 @@ public abstract class AbstractWorldMapData {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-98"
+		descriptor = "(I)I",
+		garbageValue = "-40452526"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX;
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-750308465"
+		garbageValue = "-1885413778"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY;
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "2132924583"
+	)
+	static String method3800() {
+		return VarbitComposition.clientPreferences.hideUsername ? GraphicsObject.method1866(Login.Login_username) : Login.Login_username;
+	}
 }

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("nx")
+@ObfuscatedName("nn")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = 2753236496434466989L
+		longValue = -7798765387972925107L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 8595229954339447849L
+		longValue = -7601415967447265427L
 	)
 	@Export("offset")
 	long offset;
@@ -49,21 +49,21 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-472511501"
+		garbageValue = "-835531567"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
-		if ((long)var3 + this.offset > this.maxSize) {
+		if (this.offset + (long)var3 > this.maxSize) {
 			this.file.seek(this.maxSize);
 			this.file.write(1);
 			throw new EOFException();
@@ -73,20 +73,20 @@ public final class AccessFile {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "65280"
+		garbageValue = "-2140566531"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "-267600325"
+		garbageValue = "1203753270"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)J",
-		garbageValue = "800722102"
+		descriptor = "(B)J",
+		garbageValue = "112"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)I",
-		garbageValue = "3"
+		descriptor = "([BIIS)I",
+		garbageValue = "20876"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {
@@ -136,4 +136,13 @@ public final class AccessFile {
 		}
 
 	}
+
+	@ObfuscatedName("ek")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "1980945525"
+	)
+	static int method6644(int var0) {
+		return var0 * 3 + 600;
+	}
 }

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

@@ -3,322 +3,321 @@ 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("bx")
+@ObfuscatedName("cf")
 @Implements("Actor")
 public abstract class Actor extends Renderable {
-	@ObfuscatedName("an")
-	@Export("isWalking")
-	boolean isWalking;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 1978015279
+		intValue = 859699173
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -2029968485
+		intValue = 1906173449
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 197746791
+		intValue = 2031376903
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("au")
-	@ObfuscatedGetter(
-		intValue = -98605829
-	)
-	int field1023;
+	@ObfuscatedName("ae")
+	@Export("isWalking")
+	boolean isWalking;
 	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -55774215
+		intValue = 109112903
+	)
+	int field1137;
+	@ObfuscatedName("ak")
+	@ObfuscatedGetter(
+		intValue = 108323995
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("as")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 1367478127
+		intValue = 325157293
 	)
 	@Export("idleSequence")
 	int idleSequence;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -1558763
+		intValue = 710162855
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("az")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -584031907
+		intValue = -1261206163
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = 755646491
+		intValue = 954630749
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 869838055
+		intValue = 624221683
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = 1223187209
+		intValue = -1941620231
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1436374353
+		intValue = -1182742981
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1731805391
+		intValue = 1643817169
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ai")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ac")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("ah")
-	boolean field1079;
 	@ObfuscatedName("ag")
+	boolean field1108;
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1097782901
+		intValue = -1995115317
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -1483909439
+		intValue = 1211889675
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 668210335
+		intValue = 1604541403
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ax")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bd")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bt")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bf")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("by")
+	@ObfuscatedName("bp")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bl")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkz;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = -200885153
+		intValue = -651620429
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bw")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bh")
 	@ObfuscatedGetter(
-		intValue = -890883463
+		intValue = -1607294201
 	)
-	int field1048;
-	@ObfuscatedName("bo")
+	int field1096;
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = -1594285789
+		intValue = 1209933873
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = -973182859
+		intValue = 1480679575
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = -242541553
+		intValue = 730478525
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
 	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = 760989061
+		intValue = -519423817
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = -1588711653
+		intValue = -1945553445
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bk")
 	@ObfuscatedGetter(
-		intValue = 1689420355
+		intValue = 2024239161
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -2102439421
+		intValue = -268271383
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bn")
-	@ObfuscatedGetter(
-		intValue = 655116259
-	)
-	int field1056;
 	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = 604747837
+		intValue = 934097405
+	)
+	int field1099;
+	@ObfuscatedName("bx")
+	@ObfuscatedGetter(
+		intValue = 358555221
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 1097211523
+		intValue = 416629453
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = -2043114549
+		intValue = 1367399047
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = 1626664047
+		intValue = -499820313
 	)
-	int field1060;
+	int field1133;
+	@ObfuscatedName("bv")
+	@ObfuscatedGetter(
+		intValue = -138571811
+	)
+	int field1134;
 	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = 1777264679
+		intValue = -2138117835
 	)
-	int field1061;
-	@ObfuscatedName("bc")
+	int field1135;
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -1921017577
+		intValue = -1059579057
 	)
-	int field1062;
-	@ObfuscatedName("bp")
+	int field1121;
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = 584135247
+		intValue = -209560377
 	)
-	int field1063;
-	@ObfuscatedName("bh")
+	int field1141;
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = -754676609
+		intValue = -1658774391
 	)
-	int field1064;
-	@ObfuscatedName("be")
+	int field1110;
+	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = 1614280993
+		intValue = -1482421269
 	)
-	int field1065;
-	@ObfuscatedName("cb")
+	int field1139;
+	@ObfuscatedName("ci")
 	@ObfuscatedGetter(
-		intValue = -669523835
+		intValue = -1273273369
 	)
-	int field1073;
+	int field1140;
 	@ObfuscatedName("cl")
 	@ObfuscatedGetter(
-		intValue = -1177596115
+		intValue = -1602302083
 	)
-	int field1067;
-	@ObfuscatedName("ce")
+	int field1101;
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = 1387618969
-	)
-	int field1050;
-	@ObfuscatedName("cf")
-	@ObfuscatedGetter(
-		intValue = 321793587
+		intValue = 1519576615
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cw")
+	@ObfuscatedName("co")
 	@ObfuscatedGetter(
-		intValue = -772435111
+		intValue = 869477707
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cb")
 	@ObfuscatedGetter(
-		intValue = 1826498157
+		intValue = 544403561
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cf")
 	@ObfuscatedGetter(
-		intValue = 472572481
+		intValue = -1375996437
 	)
-	int field1072;
-	@ObfuscatedName("cj")
+	int field1145;
+	@ObfuscatedName("cc")
 	@ObfuscatedGetter(
-		intValue = -293816803
+		intValue = 2052402129
 	)
-	int field1074;
+	int field1146;
 	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1119314223
+		intValue = -745432089
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("ch")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cx")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cv")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cr")
 	@ObfuscatedGetter(
-		intValue = -515644987
+		intValue = 590723515
 	)
-	int field1078;
-	@ObfuscatedName("ch")
+	int field1151;
+	@ObfuscatedName("cq")
 	@ObfuscatedGetter(
-		intValue = -1840571553
+		intValue = 531606775
 	)
-	int field1066;
+	int field1152;
 
 	Actor() {
 		this.isWalking = false;
-		this.field1023 = 1;
+		this.field1137 = 1;
 		this.idleSequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -328,7 +327,7 @@ public abstract class Actor extends Renderable {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field1079 = false;
+		this.field1108 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -341,7 +340,7 @@ public abstract class Actor extends Renderable {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field1048 = -1;
+		this.field1096 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -349,46 +348,46 @@ public abstract class Actor extends Renderable {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field1056 = 0;
+		this.field1099 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field1072 = 0;
-		this.field1074 = 32;
+		this.field1145 = 0;
+		this.field1146 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field1078 = 0;
-		this.field1066 = 0;
+		this.field1151 = 0;
+		this.field1152 = 0;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "74"
+		descriptor = "(I)Z",
+		garbageValue = "-1101417957"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1689225091"
+		descriptor = "(B)V",
+		garbageValue = "-123"
 	)
-	final void method1872() {
+	final void method2123() {
 		this.pathLength = 0;
-		this.field1066 = 0;
+		this.field1152 = 0;
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIB)V",
-		garbageValue = "46"
+		garbageValue = "73"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -408,9 +407,9 @@ public abstract class Actor extends Renderable {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = ObjectComposition.method3044(var1);
-			var10 = var12.field1725;
-			var11 = var12.field1716;
+			HitSplatDefinition var12 = PendingSpawn.method2120(var1);
+			var10 = var12.field1813;
+			var11 = var12.field1804;
 		}
 
 		int var14;
@@ -466,14 +465,14 @@ public abstract class Actor extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)V",
-		garbageValue = "1867872828"
+		descriptor = "(IIIIIIB)V",
+		garbageValue = "75"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var7 = GraphicsObject.method1647(var1);
+		HealthBarDefinition var7 = class1.method12(var1);
 		HealthBar var8 = null;
 		HealthBar var9 = null;
 		int var10 = var7.int2;
@@ -482,7 +481,7 @@ public abstract class Actor extends Renderable {
 		HealthBar var12;
 		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) {
 			++var11;
-			if (var12.definition.field1578 == var7.field1578) {
+			if (var12.definition.field1670 == var7.field1670) {
 				var12.put(var2 + var4, var5, var6, var3);
 				return;
 			}
@@ -513,14 +512,14 @@ public abstract class Actor extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "798953019"
+		garbageValue = "-63793627"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = GraphicsObject.method1647(var1);
+		HealthBarDefinition var2 = class1.method12(var1);
 
 		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) {
 			if (var2 == var3.definition) {
@@ -531,386 +530,40 @@ public abstract class Actor extends Renderable {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("jr")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;IIB)[Lom;",
-		garbageValue = "49"
+		descriptor = "(Ljd;I)V",
+		garbageValue = "1972737451"
 	)
-	public static SpritePixels[] method1884(AbstractArchive var0, int var1, int var2) {
-		return !class290.method5208(var0, var1, var2) ? null : class163.method3229();
+	@Export("invalidateWidget")
+	static void invalidateWidget(Widget var0) {
+		if (var0.cycle == Client.field696) {
+			Client.field697[var0.rootIndex] = true;
+		}
+
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("kg")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "-1455646950"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "2106118340"
 	)
-	static int method1887(int var0, Script var1, boolean var2) {
-		String var7;
-		if (var0 == ScriptOpcodes.MES) {
-			var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-			class120.addGameMessage(0, "", var7);
-			return 1;
-		} else if (var0 == ScriptOpcodes.ANIM) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			ParamComposition.performPlayerAnimation(MouseHandler.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_CLOSE) {
-			if (!Interpreter.field740) {
-				Interpreter.field752 = true;
-			}
+	static void method2132(String var0) {
+		WorldMapIcon_0.field2104 = var0;
 
-			return 1;
-		} else {
-			int var16;
-			if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
-				var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-				var16 = 0;
-				if (class249.isNumber(var7)) {
-					var16 = NetCache.method5088(var7);
-				}
-
-				PacketBufferNode var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher);
-				var14.packetBuffer.writeInt(var16);
-				Client.packetWriter.addNode(var14);
-				return 1;
+		try {
+			String var1 = ArchiveDiskActionHandler.client.getParameter(Integer.toString(18));
+			String var2 = ArchiveDiskActionHandler.client.getParameter(Integer.toString(13));
+			String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2;
+			if (var0.length() == 0) {
+				var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
 			} else {
-				PacketBufferNode var12;
-				if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
-					var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher);
-					var12.packetBuffer.writeByte(var7.length() + 1);
-					var12.packetBuffer.writeStringCp1252NullTerminated(var7);
-					Client.packetWriter.addNode(var12);
-					return 1;
-				} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
-					var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher);
-					var12.packetBuffer.writeByte(var7.length() + 1);
-					var12.packetBuffer.writeStringCp1252NullTerminated(var7);
-					Client.packetWriter.addNode(var12);
-					return 1;
-				} else {
-					String var4;
-					int var10;
-					if (var0 == ScriptOpcodes.OPPLAYER) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var4 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-						class108.method2304(var10, var4);
-						return 1;
-					} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
-						Interpreter.Interpreter_intStackSize -= 3;
-						var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-						var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-						int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-						Widget var15 = UrlRequester.getWidget(var9);
-						ItemContainer.clickWidget(var15, var10, var16);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
-						Interpreter.Interpreter_intStackSize -= 2;
-						var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-						var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-						Widget var13 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget;
-						ItemContainer.clickWidget(var13, var10, var16);
-						return 1;
-					} else if (var0 == ScriptOpcodes.MOUSECAM) {
-						class310.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.roofsHidden ? 1 : 0;
-						return 1;
-					} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
-						Decimator.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						MilliClock.savePreferences();
-						return 1;
-					} else if (var0 == ScriptOpcodes.OPENURL) {
-						var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-						boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						InvDefinition.openURL(var7, var8, false);
-						return 1;
-					} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher);
-						var12.packetBuffer.writeShort(var10);
-						Client.packetWriter.addNode(var12);
-						return 1;
-					} else if (var0 == ScriptOpcodes.BUG_REPORT) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						class1.Interpreter_stringStackSize -= 2;
-						var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize];
-						String var5 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1];
-						if (var4.length() > 500) {
-							return 1;
-						} else if (var5.length() > 500) {
-							return 1;
-						} else {
-							PacketBufferNode var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher);
-							var6.packetBuffer.writeShort(1 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var4) + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var5));
-							var6.packetBuffer.writeStringCp1252NullTerminated(var5);
-							var6.packetBuffer.method6685(var10);
-							var6.packetBuffer.writeStringCp1252NullTerminated(var4);
-							Client.packetWriter.addNode(var6);
-							return 1;
-						}
-					} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
-						Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
-						Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else if (var0 == ScriptOpcodes.RENDERSELF) {
-						Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else if (var0 == 3120) {
-						if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) {
-							Client.drawPlayerNames |= 1;
-						} else {
-							Client.drawPlayerNames &= -2;
-						}
-
-						return 1;
-					} else if (var0 == 3121) {
-						if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) {
-							Client.drawPlayerNames |= 2;
-						} else {
-							Client.drawPlayerNames &= -3;
-						}
-
-						return 1;
-					} else if (var0 == 3122) {
-						if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) {
-							Client.drawPlayerNames |= 4;
-						} else {
-							Client.drawPlayerNames &= -5;
-						}
-
-						return 1;
-					} else if (var0 == 3123) {
-						if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) {
-							Client.drawPlayerNames |= 8;
-						} else {
-							Client.drawPlayerNames &= -9;
-						}
-
-						return 1;
-					} else if (var0 == 3124) {
-						Client.drawPlayerNames = 0;
-						return 1;
-					} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
-						Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
-						Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
-						class15.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1);
-						return 1;
-					} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ReflectionCheck.getTapToDrop() ? 1 : 0;
-						return 1;
-					} else if (var0 == 3129) {
-						Interpreter.Interpreter_intStackSize -= 2;
-						Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-						Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-						return 1;
-					} else if (var0 == 3130) {
-						Interpreter.Interpreter_intStackSize -= 2;
-						return 1;
-					} else if (var0 == 3131) {
-						--Interpreter.Interpreter_intStackSize;
-						return 1;
-					} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.canvasWidth;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.canvasHeight;
-						return 1;
-					} else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
-						--Interpreter.Interpreter_intStackSize;
-						return 1;
-					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
-						return 1;
-					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
-						Interpreter.Interpreter_intStackSize -= 2;
-						return 1;
-					} else if (var0 == 3136) {
-						Client.field569 = 3;
-						Client.field483 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						return 1;
-					} else if (var0 == 3137) {
-						Client.field569 = 2;
-						Client.field483 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						return 1;
-					} else if (var0 == 3138) {
-						Client.field569 = 0;
-						return 1;
-					} else if (var0 == 3139) {
-						Client.field569 = 1;
-						return 1;
-					} else if (var0 == 3140) {
-						Client.field569 = 3;
-						Client.field483 = var2 ? GrandExchangeOffer.scriptDotWidget.id * -1996852661 * 611927907 : Interpreter.scriptActiveWidget.id * -1996852661 * 611927907;
-						return 1;
-					} else {
-						boolean var11;
-						if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
-							var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Decimator.clientPreferences.hideUsername = var11;
-							MilliClock.savePreferences();
-							return 1;
-						} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.hideUsername ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
-							var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Client.Login_isUsernameRemembered = var11;
-							if (!var11) {
-								Decimator.clientPreferences.rememberedUsername = "";
-								MilliClock.savePreferences();
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
-							return 1;
-						} else if (var0 == 3146) {
-							var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (var11 == Decimator.clientPreferences.titleMusicDisabled) {
-								Decimator.clientPreferences.titleMusicDisabled = !var11;
-								MilliClock.savePreferences();
-							}
-
-							return 1;
-						} else if (var0 == 3147) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.titleMusicDisabled ? 0 : 1;
-							return 1;
-						} else if (var0 == 3148) {
-							return 1;
-						} else if (var0 == 3149) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3150) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3151) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3152) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3153) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
-							return 1;
-						} else if (var0 == 3154) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptEvent.method1807();
-							return 1;
-						} else if (var0 == 3155) {
-							--class1.Interpreter_stringStackSize;
-							return 1;
-						} else if (var0 == 3156) {
-							return 1;
-						} else if (var0 == 3157) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							return 1;
-						} else if (var0 == 3158) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3159) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3160) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3161) {
-							--Interpreter.Interpreter_intStackSize;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3162) {
-							--Interpreter.Interpreter_intStackSize;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3163) {
-							--class1.Interpreter_stringStackSize;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3164) {
-							--Interpreter.Interpreter_intStackSize;
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							return 1;
-						} else if (var0 == 3165) {
-							--Interpreter.Interpreter_intStackSize;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3166) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3167) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3168) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-							return 1;
-						} else if (var0 == 3169) {
-							return 1;
-						} else if (var0 == 3170) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3171) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3172) {
-							--Interpreter.Interpreter_intStackSize;
-							return 1;
-						} else if (var0 == 3173) {
-							--Interpreter.Interpreter_intStackSize;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3174) {
-							--Interpreter.Interpreter_intStackSize;
-							return 1;
-						} else if (var0 == 3175) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							return 1;
-						} else if (var0 == 3176) {
-							return 1;
-						} else if (var0 == 3177) {
-							return 1;
-						} else if (var0 == 3178) {
-							--class1.Interpreter_stringStackSize;
-							return 1;
-						} else if (var0 == 3179) {
-							return 1;
-						} else if (var0 == 3180) {
-							--class1.Interpreter_stringStackSize;
-							return 1;
-						} else if (var0 == 3181) {
-							var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100);
-							BuddyRankComparator.method2200((double)(0.5F + (float)var10 / 200.0F));
-							return 1;
-						} else if (var0 == 3182) {
-							float var3 = ((float)Decimator.clientPreferences.field1117 - 0.5F) * 200.0F;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 100 - Math.round(var3);
-							return 1;
-						} else if (var0 != 3183 && var0 != 3184) {
-							return 2;
-						} else {
-							--Interpreter.Interpreter_intStackSize;
-							return 1;
-						}
-					}
-				}
+				var3 = var3 + "; Expires=" + class12.method172(Occluder.method4335() + 94608000000L) + "; Max-Age=" + 94608000L;
 			}
+
+			class27.method397(ArchiveDiskActionHandler.client, "document.cookie=\"" + var3 + "\"");
+		} catch (Throwable var4) {
 		}
+
 	}
 }

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("gp")
+@ObfuscatedName("ht")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("s")
-	static int[] field2220;
-	@ObfuscatedName("t")
-	static int[] field2212;
-	@ObfuscatedName("v")
-	static int[] field2213;
-	@ObfuscatedName("j")
-	static int[] field2214;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
+	static int[] field2295;
+	@ObfuscatedName("c")
+	static int[] field2301;
+	@ObfuscatedName("m")
+	static int[] field2296;
+	@ObfuscatedName("k")
+	static int[] field2298;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lgj;"
+		descriptor = "Lhm;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field2220 = new int[500];
-		field2212 = new int[500];
-		field2213 = new int[500];
-		field2214 = new int[500];
+		field2295 = new int[500];
+		field2301 = new int[500];
+		field2296 = new int[500];
+		field2298 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "([BLgj;)V"
+		descriptor = "([BLhm;)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) {
-							field2220[var7] = var10;
-							field2212[var7] = 0;
-							field2213[var7] = 0;
-							field2214[var7] = 0;
+							field2295[var7] = var10;
+							field2301[var7] = 0;
+							field2296[var7] = 0;
+							field2298[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field2220[var7] = var8;
+				field2295[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field2212[var7] = var4.readShortSmart();
+					field2301[var7] = var4.readShortSmart();
 				} else {
-					field2212[var7] = var11;
+					field2301[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field2213[var7] = var4.readShortSmart();
+					field2296[var7] = var4.readShortSmart();
 				} else {
-					field2213[var7] = var11;
+					field2296[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field2214[var7] = var4.readShortSmart();
+					field2298[var7] = var4.readShortSmart();
 				} else {
-					field2214[var7] = var11;
+					field2298[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] = field2220[var8];
-				this.transformXs[var8] = field2212[var8];
-				this.transformYs[var8] = field2213[var8];
-				this.transformZs[var8] = field2214[var8];
+				this.transformSkeletonLabels[var8] = field2295[var8];
+				this.transformXs[var8] = field2301[var8];
+				this.transformYs[var8] = field2296[var8];
+				this.transformZs[var8] = field2298[var8];
 			}
 
 		}

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

@@ -1,249 +1,722 @@
 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("ap")
+@ObfuscatedName("br")
 @Implements("ApproximateRouteStrategy")
 public class ApproximateRouteStrategy extends RouteStrategy {
-	@ObfuscatedName("bo")
+	@ObfuscatedName("tc")
 	@ObfuscatedSignature(
-		descriptor = "[Lof;"
+		descriptor = "Lms;"
 	)
-	@Export("worldSelectArrows")
-	static IndexedSprite[] worldSelectArrows;
-	@ObfuscatedName("dd")
+	@Export("masterDisk")
+	static ArchiveDisk masterDisk;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -301087245
+	)
+	static int field466;
+	@ObfuscatedName("ei")
 	@ObfuscatedSignature(
-		descriptor = "Ljs;"
+		descriptor = "Lkx;"
 	)
-	@Export("archive12")
-	static Archive archive12;
+	@Export("archive14")
+	static Archive archive14;
+	@ObfuscatedName("iv")
+	@ObfuscatedGetter(
+		intValue = 2002085165
+	)
+	@Export("cameraPitch")
+	static int cameraPitch;
+	@ObfuscatedName("mn")
+	@ObfuscatedGetter(
+		intValue = 132174869
+	)
+	@Export("menuY")
+	static int menuY;
 
 	ApproximateRouteStrategy() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IIILfy;I)Z",
-		garbageValue = "-1237332144"
+		descriptor = "(IIILfk;S)Z",
+		garbageValue = "13398"
 	)
 	@Export("hasArrived")
 	protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
 		return var2 == super.approxDestinationX && var3 == super.approxDestinationY;
 	}
 
-	@ObfuscatedName("j")
-	public static int method880(long var0) {
-		return (int)(var0 >>> 0 & 127L);
-	}
-
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)[Lou;",
-		garbageValue = "50"
+		descriptor = "(II)Ljava/lang/String;",
+		garbageValue = "-1224455590"
 	)
-	@Export("FillMode_values")
-	public static FillMode[] FillMode_values() {
-		return new FillMode[]{FillMode.field4256, FillMode.SOLID, FillMode.field4255};
+	static String method1122(int var0) {
+		return "<img=" + var0 + ">";
 	}
 
-	@ObfuscatedName("gy")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lbb;ZI)V",
-		garbageValue = "-2147483639"
+		descriptor = "(Llu;Llu;Llu;I)V",
+		garbageValue = "-369767487"
 	)
-	@Export("addPlayerToScene")
-	static void addPlayerToScene(Player var0, boolean var1) {
-		if (var0 != null && var0.isVisible() && !var0.isHidden) {
-			var0.isUnanimated = false;
-			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) {
-				var0.isUnanimated = true;
+	@Export("drawTitle")
+	static void drawTitle(Font var0, Font var1, Font var2) {
+		Login.xPadding = (InvDefinition.canvasWidth - 765) / 2;
+		Login.loginBoxX = Login.xPadding + 202;
+		class11.loginBoxCenter = Login.loginBoxX + 180;
+		byte var3;
+		int var4;
+		int var7;
+		int var25;
+		int var32;
+		int var45;
+		if (Login.worldSelectOpen) {
+			if (DevicePcmPlayerProvider.worldSelectBackSprites == null) {
+				DevicePcmPlayerProvider.worldSelectBackSprites = Messages.method2332(World.archive8, "sl_back", "");
 			}
 
-			int var2 = var0.x >> 7;
-			int var3 = var0.y >> 7;
-			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
-				long var4 = class171.calculateTag(0, 0, 0, false, var0.index);
-				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) {
-					var0.isUnanimated = false;
-					var0.tileHeight = class122.getTileHeight(var0.x, var0.y, GrandExchangeEvent.Client_plane);
-					var0.playerCycle = Client.cycle;
-					WorldMapIcon_1.scene.addNullableObject(GrandExchangeEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY);
-				} else {
-					if ((var0.x & 127) == 64 && (var0.y & 127) == 64) {
-						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
-							return;
-						}
+			if (WorldMapSection1.worldSelectFlagSprites == null) {
+				WorldMapSection1.worldSelectFlagSprites = PacketBuffer.method6764(World.archive8, "sl_flags", "");
+			}
 
-						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount;
+			if (World.worldSelectArrows == null) {
+				World.worldSelectArrows = PacketBuffer.method6764(World.archive8, "sl_arrows", "");
+			}
+
+			if (class7.worldSelectStars == null) {
+				class7.worldSelectStars = PacketBuffer.method6764(World.archive8, "sl_stars", "");
+			}
+
+			if (class184.worldSelectLeftSprite == null) {
+				class184.worldSelectLeftSprite = class196.SpriteBuffer_getIndexedSpriteByName(World.archive8, "leftarrow", "");
+			}
+
+			if (FriendsChat.worldSelectRightSprite == null) {
+				FriendsChat.worldSelectRightSprite = class196.SpriteBuffer_getIndexedSpriteByName(World.archive8, "rightarrow", "");
+			}
+
+			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
+			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624);
+			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513);
+			var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
+			if (class7.worldSelectStars != null) {
+				class7.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
+				var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1);
+				class7.worldSelectStars[0].drawAt(Login.xPadding + 140, 12);
+				var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1);
+			}
+
+			if (World.worldSelectArrows != null) {
+				var32 = Login.xPadding + 280;
+				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) {
+					World.worldSelectArrows[2].drawAt(var32, 4);
+				} else {
+					World.worldSelectArrows[0].drawAt(var32, 4);
+				}
+
+				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) {
+					World.worldSelectArrows[3].drawAt(var32 + 15, 4);
+				} else {
+					World.worldSelectArrows[1].drawAt(var32 + 15, 4);
+				}
+
+				var0.draw("World", var32 + 32, 17, 16777215, -1);
+				var4 = Login.xPadding + 390;
+				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) {
+					World.worldSelectArrows[2].drawAt(var4, 4);
+				} else {
+					World.worldSelectArrows[0].drawAt(var4, 4);
+				}
+
+				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) {
+					World.worldSelectArrows[3].drawAt(var4 + 15, 4);
+				} else {
+					World.worldSelectArrows[1].drawAt(var4 + 15, 4);
+				}
+
+				var0.draw("Players", var4 + 32, 17, 16777215, -1);
+				var45 = Login.xPadding + 500;
+				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) {
+					World.worldSelectArrows[2].drawAt(var45, 4);
+				} else {
+					World.worldSelectArrows[0].drawAt(var45, 4);
+				}
+
+				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) {
+					World.worldSelectArrows[3].drawAt(var45 + 15, 4);
+				} else {
+					World.worldSelectArrows[1].drawAt(var45 + 15, 4);
+				}
+
+				var0.draw("Location", var45 + 32, 17, 16777215, -1);
+				var25 = Login.xPadding + 610;
+				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) {
+					World.worldSelectArrows[2].drawAt(var25, 4);
+				} else {
+					World.worldSelectArrows[0].drawAt(var25, 4);
+				}
+
+				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) {
+					World.worldSelectArrows[3].drawAt(var25 + 15, 4);
+				} else {
+					World.worldSelectArrows[1].drawAt(var25 + 15, 4);
+				}
+
+				var0.draw("Type", var25 + 32, 17, 16777215, -1);
+			}
+
+			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0);
+			var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1);
+			Login.hoveredWorldIndex = -1;
+			if (DevicePcmPlayerProvider.worldSelectBackSprites != null) {
+				var3 = 88;
+				byte var39 = 19;
+				var45 = 765 / (var3 + 1) - 1;
+				var25 = 480 / (var39 + 1);
+
+				int var35;
+				do {
+					var7 = var25;
+					var35 = var45;
+					if (var25 * (var45 - 1) >= World.World_count) {
+						--var45;
 					}
 
-					var0.tileHeight = class122.getTileHeight(var0.x, var0.y, GrandExchangeEvent.Client_plane);
-					var0.playerCycle = Client.cycle;
-					WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking);
-				}
-			}
-		}
+					if (var45 * (var25 - 1) >= World.World_count) {
+						--var25;
+					}
 
-	}
+					if (var45 * (var25 - 1) >= World.World_count) {
+						--var25;
+					}
+				} while(var7 != var25 || var35 != var45);
 
-	@ObfuscatedName("il")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-514166571"
-	)
-	@Export("selectSpell")
-	static void selectSpell(int var0, int var1, int var2, int var3) {
-		Widget var4 = ObjectSound.getWidgetChild(var0, var1);
-		if (var4 != null && var4.onTargetEnter != null) {
-			ScriptEvent var5 = new ScriptEvent();
-			var5.widget = var4;
-			var5.args = var4.onTargetEnter;
-			UserComparator10.runScriptEvent(var5);
-		}
-
-		Client.field564 = var3;
-		Client.isSpellSelected = true;
-		PcmPlayer.selectedSpellWidget = var0;
-		Client.selectedSpellChildIndex = var1;
-		ViewportMouse.selectedSpellFlags = var2;
-		AttackOption.invalidateWidget(var4);
-	}
-
-	@ObfuscatedName("ki")
-	@ObfuscatedSignature(
-		descriptor = "(IS)V",
-		garbageValue = "-26736"
-	)
-	@Export("changeGameOptions")
-	static final void changeGameOptions(int var0) {
-		class107.method2291();
-		VarcInt.method2741();
-		int var1 = FriendSystem.VarpDefinition_get(var0).type;
-		if (var1 != 0) {
-			int var2 = Varps.Varps_main[var0];
-			if (var1 == 1) {
-				if (var2 == 1) {
-					BuddyRankComparator.method2200(0.9D);
+				var7 = (765 - var45 * var3) / (var45 + 1);
+				if (var7 > 5) {
+					var7 = 5;
 				}
 
-				if (var2 == 2) {
-					BuddyRankComparator.method2200(0.8D);
+				var35 = (480 - var25 * var39) / (var25 + 1);
+				if (var35 > 5) {
+					var35 = 5;
 				}
 
-				if (var2 == 3) {
-					BuddyRankComparator.method2200(0.7D);
+				int var37 = (765 - var45 * var3 - var7 * (var45 - 1)) / 2;
+				int var38 = (480 - var39 * var25 - var35 * (var25 - 1)) / 2;
+				int var28 = (var25 + World.World_count - 1) / var25;
+				Login.worldSelectPagesCount = var28 - var45;
+				if (class184.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
+					class184.worldSelectLeftSprite.drawAt(8, GameEngine.canvasHeight / 2 - class184.worldSelectLeftSprite.subHeight / 2);
 				}
 
-				if (var2 == 4) {
-					BuddyRankComparator.method2200(0.6D);
+				if (FriendsChat.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
+					FriendsChat.worldSelectRightSprite.drawAt(InvDefinition.canvasWidth - FriendsChat.worldSelectRightSprite.subWidth - 8, GameEngine.canvasHeight / 2 - FriendsChat.worldSelectRightSprite.subHeight / 2);
+				}
+
+				int var29 = var38 + 23;
+				int var40 = var37 + Login.xPadding;
+				int var41 = 0;
+				boolean var42 = false;
+				int var43 = Login.worldSelectPage;
+
+				int var17;
+				for (var17 = var25 * var43; var17 < World.World_count && var43 - Login.worldSelectPage < var45; ++var17) {
+					World var18 = class393.World_worlds[var17];
+					boolean var19 = true;
+					String var20 = Integer.toString(var18.population);
+					if (var18.population == -1) {
+						var20 = "OFF";
+						var19 = false;
+					} else if (var18.population > 1980) {
+						var20 = "FULL";
+						var19 = false;
+					}
+
+					int var22 = 0;
+					byte var21;
+					if (var18.isBeta()) {
+						if (var18.isMembersOnly()) {
+							var21 = 7;
+						} else {
+							var21 = 6;
+						}
+					} else if (var18.isDeadman()) {
+						var22 = 16711680;
+						if (var18.isMembersOnly()) {
+							var21 = 5;
+						} else {
+							var21 = 4;
+						}
+					} else if (var18.method1616()) {
+						if (var18.isMembersOnly()) {
+							var21 = 9;
+						} else {
+							var21 = 8;
+						}
+					} else if (var18.isPvp()) {
+						if (var18.isMembersOnly()) {
+							var21 = 3;
+						} else {
+							var21 = 2;
+						}
+					} else if (var18.isMembersOnly()) {
+						var21 = 1;
+					} else {
+						var21 = 0;
+					}
+
+					if (MouseHandler.MouseHandler_x >= var40 && MouseHandler.MouseHandler_y >= var29 && MouseHandler.MouseHandler_x < var40 + var3 && MouseHandler.MouseHandler_y < var29 + var39 && var19) {
+						Login.hoveredWorldIndex = var17;
+						DevicePcmPlayerProvider.worldSelectBackSprites[var21].drawTransOverlayAt(var40, var29, 128, 16777215);
+						var42 = true;
+					} else {
+						DevicePcmPlayerProvider.worldSelectBackSprites[var21].drawAt(var40, var29);
+					}
+
+					if (WorldMapSection1.worldSelectFlagSprites != null) {
+						WorldMapSection1.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var40 + 29, var29);
+					}
+
+					var0.drawCentered(Integer.toString(var18.id), var40 + 15, var39 / 2 + var29 + 5, var22, -1);
+					var1.drawCentered(var20, var40 + 60, var39 / 2 + var29 + 5, 268435455, -1);
+					var29 = var29 + var35 + var39;
+					++var41;
+					if (var41 >= var25) {
+						var29 = var38 + 23;
+						var40 = var40 + var7 + var3;
+						var41 = 0;
+						++var43;
+					}
+				}
+
+				if (var42) {
+					var17 = var1.stringWidth(class393.World_worlds[Login.hoveredWorldIndex].activity) + 6;
+					int var30 = var1.ascent + 8;
+					int var44 = MouseHandler.MouseHandler_y + 25;
+					if (var44 + var30 > 480) {
+						var44 = MouseHandler.MouseHandler_y - 25 - var30;
+					}
+
+					Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var30, 16777120);
+					Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var30, 0);
+					var1.drawCentered(class393.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var44 + var1.ascent + 4, 0, -1);
 				}
 			}
 
-			if (var1 == 3) {
-				if (var2 == 0) {
-					TaskHandler.method2582(255);
-				}
+			class11.rasterProvider.drawFull(0, 0);
+		} else {
+			class318.leftTitleSprite.drawAt(Login.xPadding, 0);
+			Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+			class394.logoSprite.drawAt(Login.xPadding + 382 - class394.logoSprite.subWidth / 2, 18);
+			if (Client.gameState == 0 || Client.gameState == 5) {
+				var3 = 20;
+				var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1);
+				var4 = 253 - var3;
+				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409);
+				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0);
+				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
+				Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
+				var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1);
+			}
 
-				if (var2 == 1) {
-					TaskHandler.method2582(192);
-				}
+			String var5;
+			String var6;
+			short var31;
+			short var33;
+			if (Client.gameState == 20) {
+				Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2);
+				var31 = 201;
+				var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0);
+				var32 = var31 + 15;
+				var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0);
+				var32 += 15;
+				var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0);
+				var32 += 15;
+				var32 += 7;
+				if (Login.loginIndex != 4 && Login.loginIndex != 10) {
+					var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0);
+					var33 = 200;
 
-				if (var2 == 2) {
-					TaskHandler.method2582(128);
-				}
+					for (var5 = AbstractWorldMapData.method3800(); var0.stringWidth(var5) > var33; var5 = var5.substring(0, var5.length() - 1)) {
+					}
 
-				if (var2 == 3) {
-					TaskHandler.method2582(64);
-				}
+					var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var32, 16777215, 0);
+					var32 += 15;
 
-				if (var2 == 4) {
-					TaskHandler.method2582(0);
+					for (var6 = GraphicsObject.method1866(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) {
+					}
+
+					var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var32, 16777215, 0);
+					var32 += 15;
 				}
 			}
 
-			if (var1 == 4) {
-				if (var2 == 0) {
-					class98.updateSoundEffectVolume(127);
-				}
+			if (Client.gameState == 10 || Client.gameState == 11) {
+				Login.titleboxSprite.drawAt(Login.loginBoxX, 171);
+				short var23;
+				if (Login.loginIndex == 0) {
+					var31 = 251;
+					var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0);
+					var32 = var31 + 30;
+					var4 = Login.loginBoxX + 180 - 80;
+					var23 = 291;
+					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+					var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+					var4 = Login.loginBoxX + 180 + 80;
+					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+					var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+				} else if (Login.loginIndex == 1) {
+					var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0);
+					var31 = 236;
+					var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0);
+					var32 = var31 + 15;
+					var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0);
+					var32 += 15;
+					var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0);
+					var32 += 15;
+					var4 = Login.loginBoxX + 180 - 80;
+					var23 = 321;
+					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+					var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0);
+					var4 = Login.loginBoxX + 180 + 80;
+					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+					var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0);
+				} else if (Login.loginIndex == 2) {
+					var31 = 201;
+					var0.drawCentered(Login.Login_response1, class11.loginBoxCenter, var31, 16776960, 0);
+					var32 = var31 + 15;
+					var0.drawCentered(Login.Login_response2, class11.loginBoxCenter, var32, 16776960, 0);
+					var32 += 15;
+					var0.drawCentered(Login.Login_response3, class11.loginBoxCenter, var32, 16776960, 0);
+					var32 += 15;
+					var32 += 7;
+					var0.draw("Login: ", class11.loginBoxCenter - 110, var32, 16777215, 0);
+					var33 = 200;
 
-				if (var2 == 1) {
-					class98.updateSoundEffectVolume(96);
-				}
+					for (var5 = AbstractWorldMapData.method3800(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) {
+					}
 
-				if (var2 == 2) {
-					class98.updateSoundEffectVolume(64);
-				}
+					var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), class11.loginBoxCenter - 70, var32, 16777215, 0);
+					var32 += 15;
 
-				if (var2 == 3) {
-					class98.updateSoundEffectVolume(32);
-				}
+					for (var6 = GraphicsObject.method1866(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) {
+					}
 
-				if (var2 == 4) {
-					class98.updateSoundEffectVolume(0);
-				}
-			}
+					var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), class11.loginBoxCenter - 108, var32, 16777215, 0);
+					var32 += 15;
+					var31 = 277;
+					var7 = class11.loginBoxCenter + -117;
+					boolean var9 = Client.Login_isUsernameRemembered;
+					boolean var10 = Login.field891;
+					IndexedSprite var26 = var9 ? (var10 ? PlayerComposition.field3019 : Client.options_buttons_2Sprite) : (var10 ? class21.field107 : ModelData0.options_buttons_0Sprite);
+					var26.drawAt(var7, var31);
+					var7 = var7 + var26.subWidth + 5;
+					var1.draw("Remember username", var7, var31 + 13, 16776960, 0);
+					var7 = class11.loginBoxCenter + 24;
+					boolean var13 = VarbitComposition.clientPreferences.hideUsername;
+					boolean var14 = Login.field904;
+					IndexedSprite var12 = var13 ? (var14 ? PlayerComposition.field3019 : Client.options_buttons_2Sprite) : (var14 ? class21.field107 : ModelData0.options_buttons_0Sprite);
+					var12.drawAt(var7, var31);
+					var7 = var7 + var12.subWidth + 5;
+					var1.draw("Hide username", var7, var31 + 13, 16776960, 0);
+					var32 = var31 + 15;
+					int var15 = class11.loginBoxCenter - 80;
+					short var16 = 321;
+					Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20);
+					var0.drawCentered("Login", var15, var16 + 5, 16777215, 0);
+					var15 = class11.loginBoxCenter + 80;
+					Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20);
+					var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0);
+					var31 = 357;
+					switch(Login.field883) {
+					case 2:
+						LoginScreenAnimation.field1167 = "Having trouble logging in?";
+						break;
+					default:
+						LoginScreenAnimation.field1167 = "Can't login? Click here.";
+					}
 
-			if (var1 == 5) {
-				Client.leftClickOpensMenu = var2;
-			}
-
-			if (var1 == 6) {
-				Client.chatEffects = var2;
-			}
-
-			if (var1 == 9) {
-				Client.field654 = var2;
-			}
-
-			if (var1 == 10) {
-				if (var2 == 0) {
-					class16.method175(127);
-				}
-
-				if (var2 == 1) {
-					class16.method175(96);
-				}
-
-				if (var2 == 2) {
-					class16.method175(64);
-				}
-
-				if (var2 == 3) {
-					class16.method175(32);
-				}
-
-				if (var2 == 4) {
-					class16.method175(0);
-				}
-			}
-
-			if (var1 == 17) {
-				Client.followerIndex = var2 & 65535;
-			}
-
-			if (var1 == 18) {
-				Client.playerAttackOption = (AttackOption)Huffman.findEnumerated(Language.method5233(), var2);
-				if (Client.playerAttackOption == null) {
-					Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-				}
-			}
-
-			if (var1 == 19) {
-				if (var2 == -1) {
-					Client.combatTargetPlayerIndex = -1;
+					WorldMapSectionType.field2125 = new Bounds(class11.loginBoxCenter, var31, var1.stringWidth(LoginScreenAnimation.field1167), 11);
+					PcmPlayer.field287 = new Bounds(class11.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11);
+					var1.drawCentered(LoginScreenAnimation.field1167, class11.loginBoxCenter, var31, 16777215, 0);
+				} else if (Login.loginIndex == 3) {
+					var31 = 201;
+					var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0);
+					var32 = var31 + 20;
+					var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0);
+					var32 += 15;
+					var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0);
+					var32 += 15;
+					var4 = Login.loginBoxX + 180;
+					var23 = 276;
+					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+					var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0);
+					var4 = Login.loginBoxX + 180;
+					var23 = 326;
+					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+					var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0);
 				} else {
-					Client.combatTargetPlayerIndex = var2 & 2047;
+					short var8;
+					if (Login.loginIndex == 4) {
+						var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0);
+						var31 = 236;
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0);
+						var32 = var31 + 15;
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0);
+						var32 += 15;
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0);
+						var32 += 15;
+						var0.draw("PIN: " + GraphicsObject.method1866(AbstractWorldMapIcon.otp) + (Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0);
+						var32 -= 8;
+						var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0);
+						var32 += 15;
+						var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0);
+						var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
+						var45 = var32 - var0.ascent;
+						IndexedSprite var34;
+						if (Login.field893) {
+							var34 = Client.options_buttons_2Sprite;
+						} else {
+							var34 = ModelData0.options_buttons_0Sprite;
+						}
+
+						var34.drawAt(var4, var45);
+						var32 += 15;
+						var7 = Login.loginBoxX + 180 - 80;
+						var8 = 321;
+						Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20);
+						var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0);
+						var7 = Login.loginBoxX + 180 + 80;
+						Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20);
+						var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0);
+						var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var8 + 36, 255, 0);
+					} else if (Login.loginIndex == 5) {
+						var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0);
+						var31 = 221;
+						var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0);
+						var32 = var31 + 15;
+						var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var32 += 14;
+						var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0);
+						var33 = 174;
+
+						for (var5 = AbstractWorldMapData.method3800(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) {
+						}
+
+						var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0);
+						var32 += 15;
+						var25 = Login.loginBoxX + 180 - 80;
+						short var36 = 321;
+						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20);
+						var0.drawCentered("Recover", var25, var36 + 5, 16777215, 0);
+						var25 = Login.loginBoxX + 180 + 80;
+						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20);
+						var0.drawCentered("Back", var25, var36 + 5, 16777215, 0);
+						var36 = 356;
+						var1.drawCentered("Still having trouble logging in?", class11.loginBoxCenter, var36, 268435455, 0);
+					} else if (Login.loginIndex == 6) {
+						var31 = 201;
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0);
+						var32 = var31 + 15;
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var4 = Login.loginBoxX + 180;
+						var23 = 321;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 7) {
+						var31 = 216;
+						var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0);
+						var32 = var31 + 15;
+						var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var4 = Login.loginBoxX + 180 - 80;
+						var23 = 321;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0);
+						var4 = Login.loginBoxX + 180 + 80;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 8) {
+						var31 = 216;
+						var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0);
+						var32 = var31 + 15;
+						var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var4 = Login.loginBoxX + 180 - 80;
+						var23 = 321;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0);
+						var4 = Login.loginBoxX + 180 + 80;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 9) {
+						var31 = 221;
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0);
+						var32 = var31 + 25;
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 25;
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0);
+						var4 = Login.loginBoxX + 180;
+						var23 = 311;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 10) {
+						var32 = Login.loginBoxX + 180;
+						var33 = 209;
+						var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0);
+						var4 = var33 + 20;
+						UserComparator8.field1312.drawAt(var32 - 109, var4);
+						class14.field69.drawAt(var32 - 48, var4 + 18);
+					} else if (Login.loginIndex == 12) {
+						var32 = class11.loginBoxCenter;
+						var33 = 216;
+						var2.drawCentered("Before using this app, please read and accept our", var32, var33, 16777215, 0);
+						var4 = var33 + 17;
+						var2.drawCentered("<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var32, var4, 16777215, 0);
+						var4 += 17;
+						var2.drawCentered("<col=ffd200>agreement (EULA)</col>.", var32, var4, 16777215, 0);
+						var4 += 17;
+						var2.drawCentered("By accepting, you agree to these documents.", var32, var4, 16777215, 0);
+						var32 = class11.loginBoxCenter - 80;
+						var33 = 311;
+						Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20);
+						var0.drawCentered("Accept", var32, var33 + 5, 16777215, 0);
+						var32 = class11.loginBoxCenter + 80;
+						Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20);
+						var0.drawCentered("Decline", var32, var33 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 13) {
+						var31 = 231;
+						var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var31, 16777215, 0);
+						var32 = var31 + 20;
+						var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var32, 16777215, 0);
+						var4 = Login.loginBoxX + 180;
+						var31 = 311;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var31 - 20);
+						var0.drawCentered("Back", var4, var31 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 14) {
+						var31 = 201;
+						String var24 = "";
+						var5 = "";
+						var6 = "";
+						switch(Login.field874) {
+						case 0:
+							var24 = "Your account has been disabled.";
+							var5 = Strings.field3400;
+							var6 = "";
+							break;
+						case 1:
+							var24 = "Account locked as we suspect it has been stolen.";
+							var5 = Strings.field3439;
+							var6 = "";
+							break;
+						default:
+							SecureRandomFuture.Login_promptCredentials(false);
+						}
+
+						var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0);
+						var32 = var31 + 15;
+						var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0);
+						var32 += 15;
+						var7 = Login.loginBoxX + 180;
+						var8 = 276;
+						Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20);
+						var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0);
+						var7 = Login.loginBoxX + 180;
+						var8 = 326;
+						Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20);
+						var0.drawCentered("Back", var7, var8 + 5, 16777215, 0);
+					} else if (Login.loginIndex == 24) {
+						var31 = 221;
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0);
+						var32 = var31 + 15;
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0);
+						var32 += 15;
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0);
+						var32 += 15;
+						var4 = Login.loginBoxX + 180;
+						var23 = 301;
+						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20);
+						var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0);
+					}
 				}
 			}
 
-			if (var1 == 22) {
-				Client.npcAttackOption = (AttackOption)Huffman.findEnumerated(Language.method5233(), var2);
-				if (Client.npcAttackOption == null) {
-					Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+			if (Client.gameState >= 10) {
+				int[] var27 = new int[4];
+				Rasterizer2D.Rasterizer2D_getClipArray(var27);
+				Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, GameEngine.canvasHeight);
+				Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle);
+				Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle);
+				Rasterizer2D.Rasterizer2D_setClipArray(var27);
+			}
+
+			class92.title_muteSprite[VarbitComposition.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463);
+			if (Client.gameState > 5 && Language.Language_EN == class323.clientLanguage) {
+				if (class275.field3281 != null) {
+					var32 = Login.xPadding + 5;
+					var33 = 463;
+					byte var47 = 100;
+					byte var46 = 35;
+					class275.field3281.drawAt(var32, var33);
+					var0.drawCentered("World" + " " + Client.worldId, var47 / 2 + var32, var46 / 2 + var33 - 2, 16777215, 0);
+					if (WorldMapArchiveLoader.World_request != null) {
+						var1.drawCentered("Loading...", var47 / 2 + var32, var46 / 2 + var33 + 12, 16777215, 0);
+					} else {
+						var1.drawCentered("Click to switch", var47 / 2 + var32, var46 / 2 + var33 + 12, 16777215, 0);
+					}
+				} else {
+					class275.field3281 = class196.SpriteBuffer_getIndexedSpriteByName(World.archive8, "sl_button", "");
 				}
 			}
 
 		}
 	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "71"
+	)
+	static int method1123(int var0, Script var1, boolean var2) {
+		Widget var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]);
+		if (var0 == ScriptOpcodes.IF_GETX) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.x;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETY) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.y;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.width;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.height;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETHIDE) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETLAYER) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.parentId;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
 }

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

@@ -5,207 +5,158 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("js")
+@ObfuscatedName("kx")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ac")
+	@Export("hasFocus")
+	protected static boolean hasFocus;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Lms;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Lms;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1432717399
+		intValue = 571995127
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("n")
-	volatile boolean field3570;
-	@ObfuscatedName("w")
-	boolean field3566;
-	@ObfuscatedName("f")
+	@ObfuscatedName("g")
+	volatile boolean field3687;
+	@ObfuscatedName("z")
+	boolean field3688;
+	@ObfuscatedName("a")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -889459967
+		intValue = 1178742275
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1415267029
+		intValue = -308724549
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -621429149
+		intValue = 1768424995
 	)
-	int field3571;
+	int field3693;
 
 	static {
 		Archive_crc = new CRC32();
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Lln;Lln;IZZZ)V"
+		descriptor = "(Lms;Lms;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3570 = false;
-		this.field3566 = false;
-		this.field3571 = -1;
+		this.field3687 = false;
+		this.field3688 = false;
+		this.field3693 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3566 = var6;
-		int var8 = this.index;
-		if (NetCache.NetCache_reference != null) {
-			NetCache.NetCache_reference.offset = var8 * 8 + 5;
-			int var9 = NetCache.NetCache_reference.readInt();
-			int var10 = NetCache.NetCache_reference.readInt();
-			this.loadIndex(var9, var10);
-		} else {
-			NetSocket.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
-			NetCache.NetCache_archives[var8] = this;
-		}
-
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "2054889339"
-	)
-	public boolean method4955() {
-		return this.field3570;
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "887560465"
-	)
-	@Export("percentage")
-	public int percentage() {
-		if (this.field3570) {
-			return 100;
-		} else if (super.groups != null) {
-			return 99;
-		} else {
-			int var2 = this.index;
-			long var3 = (long)(var2 + 16711680);
-			int var1;
-			if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var3) {
-				var1 = UserComparator9.NetCache_responseArchiveBuffer.offset * 99 / (UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
-			} else {
-				var1 = 0;
-			}
-
-			int var5 = var1;
-			if (var1 >= 100) {
-				var5 = 99;
-			}
-
-			return var5;
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1300418650"
-	)
-	@Export("loadRegionFromGroup")
-	void loadRegionFromGroup(int var1) {
-		Clock.method2673(this.index, var1);
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
-	)
-	@Export("loadGroup")
-	void loadGroup(int var1) {
-		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			ArchiveDisk var2 = this.archiveDisk;
-			byte[] var4 = null;
-			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-				for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
-					if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) {
-						var4 = var6.data;
-						break;
-					}
-				}
-			}
-
-			if (var4 != null) {
-				this.load(var2, var1, var4, true);
-			} else {
-				byte[] var5 = var2.read(var1);
-				this.load(var2, var1, var5, true);
-			}
-		} else {
-			NetSocket.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
-		}
-
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1584411353"
-	)
-	@Export("loadIndex")
-	public void loadIndex(int var1, int var2) {
-		this.indexCrc = var1;
-		this.indexVersion = var2;
-		if (this.masterDisk != null) {
-			int var3 = this.index;
-			ArchiveDisk var4 = this.masterDisk;
-			byte[] var6 = null;
-			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-				for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
-					if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) {
-						var6 = var8.data;
-						break;
-					}
-				}
-			}
-
-			if (var6 != null) {
-				this.load(var4, var3, var6, true);
-			} else {
-				byte[] var7 = var4.read(var3);
-				this.load(var4, var3, var7, true);
-			}
-		} else {
-			NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-		}
-
+		this.field3688 = var6;
+		WorldMapLabel.method3808(this, this.index);
 	}
 
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I[BZZI)V",
-		garbageValue = "-1722711821"
+		descriptor = "(I)Z",
+		garbageValue = "1927768430"
+	)
+	public boolean method5108() {
+		return this.field3687;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "65535"
+	)
+	@Export("percentage")
+	public int percentage() {
+		if (this.field3687) {
+			return 100;
+		} else if (super.groups != null) {
+			return 99;
+		} else {
+			int var1 = class119.method2510(255, this.index);
+			if (var1 >= 100) {
+				var1 = 99;
+			}
+
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-2091662217"
+	)
+	@Export("loadRegionFromGroup")
+	void loadRegionFromGroup(int var1) {
+		Skills.method5063(this.index, var1);
+	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "16776960"
+	)
+	@Export("loadGroup")
+	void loadGroup(int var1) {
+		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
+			WorldMapRegion.method3637(var1, this.archiveDisk, this);
+		} else {
+			UserList.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+		}
+
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-1445151425"
+	)
+	@Export("loadIndex")
+	void loadIndex(int var1, int var2) {
+		this.indexCrc = var1;
+		this.indexVersion = var2;
+		if (this.masterDisk != null) {
+			WorldMapRegion.method3637(this.index, this.masterDisk, this);
+		} else {
+			UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+		}
+
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(I[BZZB)V",
+		garbageValue = "-104"
 	)
 	@Export("write")
-	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
+	void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3570) {
+			if (this.field3687) {
 				throw new RuntimeException();
 			}
 
@@ -221,16 +172,7 @@ public class Archive extends AbstractArchive {
 					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7);
 				}
 
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-					if (ArchiveDiskActionHandler.field3556 == 0) {
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
-					}
-
-					ArchiveDiskActionHandler.field3556 = 600;
-				}
+				class119.method2511();
 			}
 
 			this.decodeIndex(var2);
@@ -239,64 +181,42 @@ 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) {
-				ArchiveDisk var13 = this.archiveDisk;
-				ArchiveDiskAction var19 = new ArchiveDiskAction();
-				var19.type = 0;
-				var19.key = (long)var1;
-				var19.data = var2;
-				var19.archiveDisk = var13;
+				ArchiveDisk var11 = this.archiveDisk;
+				ArchiveDiskAction var14 = new ArchiveDiskAction();
+				var14.type = 0;
+				var14.key = (long)var1;
+				var14.data = var2;
+				var14.archiveDisk = var11;
 				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var19);
-				}
-
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-					if (ArchiveDiskActionHandler.field3556 == 0) {
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
-					}
-
-					ArchiveDiskActionHandler.field3556 = 600;
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var14);
 				}
 
+				class119.method2511();
 				this.validGroups[var1] = true;
 			}
 
 			if (var4) {
-				Object[] var21 = super.groups;
-				Object var20;
-				if (var2 == null) {
-					var20 = null;
-				} else if (var2.length > 136) {
-					DirectByteArrayCopier var8 = new DirectByteArrayCopier();
-					var8.set(var2);
-					var20 = var8;
-				} else {
-					var20 = var2;
-				}
-
-				var21[var1] = var20;
+				super.groups[var1] = VertexNormal.method4476(var2, false);
 			}
 		}
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Lln;I[BZI)V",
-		garbageValue = "-1758928614"
+		descriptor = "(Lms;I[BZB)V",
+		garbageValue = "56"
 	)
 	@Export("load")
-	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
+	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3570) {
+			if (this.field3687) {
 				throw new RuntimeException();
 			}
 
 			if (var3 == null) {
-				NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
@@ -304,37 +224,37 @@ public class Archive extends AbstractArchive {
 			Archive_crc.update(var3, 0, var3.length);
 			var5 = (int)Archive_crc.getValue();
 			if (var5 != this.indexCrc) {
-				NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
-			Buffer var11 = new Buffer(GrandExchangeOfferOwnWorldComparator.decompressBytes(var3));
-			int var12 = var11.readUnsignedByte();
-			if (var12 != 5 && var12 != 6) {
-				throw new RuntimeException(var12 + "," + this.index + "," + var2);
+			Buffer var9 = new Buffer(class134.decompressBytes(var3));
+			int var7 = var9.readUnsignedByte();
+			if (var7 != 5 && var7 != 6) {
+				throw new RuntimeException(var7 + "," + this.index + "," + var2);
 			}
 
 			int var8 = 0;
-			if (var12 >= 6) {
-				var8 = var11.readInt();
+			if (var7 >= 6) {
+				var8 = var9.readInt();
 			}
 
 			if (var8 != this.indexVersion) {
-				NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
 			this.decodeIndex(var3);
 			this.loadAllLocal();
 		} else {
-			if (!var4 && var2 == this.field3571) {
-				this.field3570 = true;
+			if (!var4 && var2 == this.field3693) {
+				this.field3687 = true;
 			}
 
 			if (var3 == null || var3.length <= 2) {
 				this.validGroups[var2] = false;
-				if (this.field3566 || var4) {
-					NetSocket.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				if (this.field3688 || var4) {
+					UserList.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -346,8 +266,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.field3566 || var4) {
-					NetSocket.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				if (this.field3688 || var4) {
+					UserList.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -355,28 +275,16 @@ public class Archive extends AbstractArchive {
 
 			this.validGroups[var2] = true;
 			if (var4) {
-				Object[] var7 = super.groups;
-				Object var9;
-				if (var3 == null) {
-					var9 = null;
-				} else if (var3.length > 136) {
-					DirectByteArrayCopier var10 = new DirectByteArrayCopier();
-					var10.set(var3);
-					var9 = var10;
-				} else {
-					var9 = var3;
-				}
-
-				var7[var2] = var9;
+				super.groups[var2] = VertexNormal.method4476(var3, false);
 			}
 		}
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2142497817"
+		garbageValue = "1311346879"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -388,9 +296,9 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3570 = true;
+			this.field3687 = true;
 		} else {
-			this.field3571 = -1;
+			this.field3693 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
@@ -404,75 +312,54 @@ public class Archive extends AbstractArchive {
 						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4);
 					}
 
-					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-						if (ArchiveDiskActionHandler.field3556 == 0) {
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
-						}
-
-						ArchiveDiskActionHandler.field3556 = 600;
-					}
-
-					this.field3571 = var1;
+					class119.method2511();
+					this.field3693 = var1;
 				}
 			}
 
-			if (this.field3571 == -1) {
-				this.field3570 = true;
+			if (this.field3693 == -1) {
+				this.field3687 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "-50"
+		descriptor = "(II)I",
+		garbageValue = "73945928"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		if (super.groups[var1] != null) {
 			return 100;
-		} else if (this.validGroups[var1]) {
-			return 100;
 		} else {
-			int var3 = this.index;
-			long var4 = (long)((var3 << 16) + var1);
-			int var2;
-			if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) {
-				var2 = UserComparator9.NetCache_responseArchiveBuffer.offset * 99 / (UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
-			} else {
-				var2 = 0;
-			}
-
-			return var2;
+			return this.validGroups[var1] ? 100 : class119.method2510(this.index, var1);
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-2066469038"
+		garbageValue = "2096742545"
 	)
-	public boolean method4964(int var1) {
+	public boolean method5117(int var1) {
 		return this.validGroups[var1];
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "722138687"
+		descriptor = "(IB)Z",
+		garbageValue = "61"
 	)
-	public boolean method4956(int var1) {
+	public boolean method5126(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1676168398"
+		garbageValue = "2041451539"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -494,4 +381,15 @@ public class Archive extends AbstractArchive {
 			return var3;
 		}
 	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(Lkk;Lkk;Ljava/lang/String;Ljava/lang/String;I)Llu;",
+		garbageValue = "-2076624345"
+	)
+	public static Font method5150(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
+		int var4 = var0.getGroupId(var2);
+		int var5 = var0.getFileId(var4, var3);
+		return AbstractSocket.method6107(var0, var1, var4, var5);
+	}
 }

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

@@ -1,42 +1,38 @@
 import java.io.EOFException;
 import java.io.IOException;
-import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ln")
+@ObfuscatedName("ms")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("f")
-	@Export("soundSystemExecutor")
-	static ScheduledExecutorService soundSystemExecutor;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnh;"
+		descriptor = "Lnm;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lnh;"
+		descriptor = "Lnm;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 2088353051
+		intValue = 498708587
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1820040305
+		intValue = 817681899
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -46,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(ILnh;Lnh;I)V"
+		descriptor = "(ILnm;Lnm;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null;
@@ -58,10 +54,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[B",
-		garbageValue = "40"
+		descriptor = "(IS)[B",
+		garbageValue = "29760"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -85,8 +81,9 @@ public final class ArchiveDisk {
 					} else {
 						byte[] var5 = new byte[var3];
 						int var6 = 0;
+						int var7 = 0;
 
-						for (int var7 = 0; var6 < var3; ++var7) {
+						while (var6 < var3) {
 							if (var4 == 0) {
 								var10000 = null;
 								return (byte[])var10000;
@@ -116,30 +113,32 @@ 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;
+
+									for (int var15 = var13; var15 < var14; ++var15) {
+										var5[var6++] = ArchiveDisk_buffer[var15];
+									}
+
+									var4 = var11;
+									++var7;
+									continue;
+								}
+
 								var10000 = null;
 								return (byte[])var10000;
 							}
 
-							if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) {
-								var10000 = null;
-								return (byte[])var10000;
-							}
-
-							int var14 = var13 + var8;
-
-							for (int var15 = var13; var15 < var14; ++var15) {
-								var5[var6++] = ArchiveDisk_buffer[var15];
-							}
-
-							var4 = var11;
+							var10000 = null;
+							return (byte[])var10000;
 						}
 
 						byte[] var20 = var5;
@@ -152,10 +151,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I[BIB)Z",
-		garbageValue = "86"
+		descriptor = "(I[BII)Z",
+		garbageValue = "-2120827724"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -173,10 +172,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I[BIZI)Z",
-		garbageValue = "1190557700"
+		descriptor = "(I[BIZB)Z",
+		garbageValue = "88"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -217,7 +216,7 @@ public final class ArchiveDisk {
 
 				while (true) {
 					if (var7 < var3) {
-						label169: {
+						label168: {
 							int var9 = 0;
 							int var10;
 							if (var4) {
@@ -228,7 +227,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10);
 									} catch (EOFException var17) {
-										break label169;
+										break label168;
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
@@ -239,7 +238,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8);
 									} catch (EOFException var16) {
-										break label169;
+										break label168;
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
@@ -248,7 +247,7 @@ public final class ArchiveDisk {
 									var12 = ArchiveDisk_buffer[7] & 255;
 								}
 
-								if (var10 != var1 || var8 != var11 || var12 != this.archive) {
+								if (var10 != var1 || var11 != var8 || var12 != this.archive) {
 									var10000 = false;
 									return var10000;
 								}
@@ -266,7 +265,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var9 == var6) {
+								if (var6 == var9) {
 									++var9;
 								}
 							}
@@ -308,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(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								this.datFile.write(ArchiveDisk_buffer, 0, 8);
 								var10 = var3 - var7;
 								if (var10 > 512) {

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

@@ -3,99 +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.ScriptOpcodes;
 
-@ObfuscatedName("ji")
+@ObfuscatedName("jq")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("iu")
-	@ObfuscatedGetter(
-		intValue = -1585386583
+	@ObfuscatedName("my")
+	@ObfuscatedSignature(
+		descriptor = "Lbk;"
 	)
-	@Export("oculusOrbFocalPointY")
-	static int oculusOrbFocalPointY;
-	@ObfuscatedName("s")
+	@Export("tempMenuAction")
+	static MenuAction tempMenuAction;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 260859515
+		intValue = -1602361703
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("data")
-	byte[] data;
-	@ObfuscatedName("v")
+	public byte[] data;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Lms;"
 	)
 	@Export("archiveDisk")
-	ArchiveDisk archiveDisk;
-	@ObfuscatedName("j")
+	public ArchiveDisk archiveDisk;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Ljs;"
+		descriptor = "Lkx;"
 	)
 	@Export("archive")
-	Archive archive;
+	public Archive archive;
 
 	ArchiveDiskAction() {
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "-54638218"
-	)
-	static int method4944(int var0, Script var1, boolean var2) {
-		Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-		if (var0 == ScriptOpcodes.IF_GETSCROLLX) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTEXT) {
-			Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.text;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTRANS) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop;
-			return 1;
-		} else if (var0 == 2610) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2;
-			return 1;
-		} else if (var0 == 2613) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
-			return 1;
-		} else if (var0 != 2615 && var0 != 2616) {
-			return 2;
-		} else {
-			++Interpreter.Interpreter_intStackSize;
-			return 1;
-		}
-	}
 }

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

@@ -4,37 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jd")
+@ObfuscatedName("ke")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lke;"
+		descriptor = "Lkn;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
-	static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("v")
+	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lke;"
+		descriptor = "Lkn;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
-	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("j")
+	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1211237295
+		intValue = -1139239247
 	)
-	static int field3556;
-	@ObfuscatedName("l")
+	public static int field3676;
+	@ObfuscatedName("k")
 	@Export("ArchiveDiskActionHandler_lock")
-	static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("n")
+	public static Object ArchiveDiskActionHandler_lock;
+	@ObfuscatedName("o")
 	@Export("ArchiveDiskActionHandler_thread")
 	static Thread ArchiveDiskActionHandler_thread;
+	@ObfuscatedName("af")
+	@Export("client")
+	@ObfuscatedSignature(
+		descriptor = "Lclient;"
+	)
+	static Client client;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3556 = 0;
+		field3676 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -63,100 +69,29 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3556 <= 1) {
-							field3556 = 0;
+						if (field3676 <= 1) {
+							field3676 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3556 = 600;
+						field3676 = 600;
 					}
 				} else {
-					SceneTilePaint.method4322(100L);
+					PlayerType.method5099(100L);
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3556 <= 1) {
-							field3556 = 0;
+						if (field3676 <= 1) {
+							field3676 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3556;
+						--field3676;
 					}
 				}
 			}
 		} catch (Exception var13) {
-			BufferedSink.RunException_sendStackTrace((String)null, var13);
+			class4.RunException_sendStackTrace((String)null, var13);
 		}
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(CI)B",
-		garbageValue = "765795855"
-	)
-	@Export("charToByteCp1252")
-	public static byte charToByteCp1252(char var0) {
-		byte var1;
-		if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
-			var1 = (byte)var0;
-		} else if (var0 == 8364) {
-			var1 = -128;
-		} else if (var0 == 8218) {
-			var1 = -126;
-		} else if (var0 == 402) {
-			var1 = -125;
-		} else if (var0 == 8222) {
-			var1 = -124;
-		} else if (var0 == 8230) {
-			var1 = -123;
-		} else if (var0 == 8224) {
-			var1 = -122;
-		} else if (var0 == 8225) {
-			var1 = -121;
-		} else if (var0 == 710) {
-			var1 = -120;
-		} else if (var0 == 8240) {
-			var1 = -119;
-		} else if (var0 == 352) {
-			var1 = -118;
-		} else if (var0 == 8249) {
-			var1 = -117;
-		} else if (var0 == 338) {
-			var1 = -116;
-		} else if (var0 == 381) {
-			var1 = -114;
-		} else if (var0 == 8216) {
-			var1 = -111;
-		} else if (var0 == 8217) {
-			var1 = -110;
-		} else if (var0 == 8220) {
-			var1 = -109;
-		} else if (var0 == 8221) {
-			var1 = -108;
-		} else if (var0 == 8226) {
-			var1 = -107;
-		} else if (var0 == 8211) {
-			var1 = -106;
-		} else if (var0 == 8212) {
-			var1 = -105;
-		} else if (var0 == 732) {
-			var1 = -104;
-		} else if (var0 == 8482) {
-			var1 = -103;
-		} else if (var0 == 353) {
-			var1 = -102;
-		} else if (var0 == 8250) {
-			var1 = -101;
-		} else if (var0 == 339) {
-			var1 = -100;
-		} else if (var0 == 382) {
-			var1 = -98;
-		} else if (var0 == 376) {
-			var1 = -97;
-		} else {
-			var1 = 63;
-		}
-
-		return var1;
-	}
 }

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

@@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ba")
+@ObfuscatedName("by")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("h")
+	@ObfuscatedName("im")
 	@ObfuscatedSignature(
-		descriptor = "Lkt;"
+		descriptor = "[Loi;"
 	)
-	@Export("ItemDefinition_fontPlain11")
-	static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("t")
+	@Export("scrollBarSprites")
+	static IndexedSprite[] scrollBarSprites;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljs;"
+		descriptor = "Lkx;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1698036073
+		intValue = -520542999
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 220643987
+		intValue = 260914757
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljava/lang/String;)V"
+		descriptor = "(Lkx;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -41,17 +41,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-3"
+		descriptor = "(I)Z",
+		garbageValue = "-1799367031"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4956(var1) || this.archive.method4964(var1)) {
+			if (!this.archive.method5126(var1) || this.archive.method5117(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -59,151 +59,231 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("ih")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhg;",
-		garbageValue = "-2061376576"
+		descriptor = "(Lfq;IIII)V",
+		garbageValue = "-2020515234"
 	)
-	public static PacketBufferNode method1779() {
-		PacketBufferNode var0 = CollisionMap.method3205();
-		var0.clientPacket = null;
-		var0.clientPacketLength = 0;
-		var0.packetBuffer = new PacketBuffer(5000);
-		return var0;
-	}
+	@Export("addNpcToMenu")
+	static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) {
+		if (Client.menuOptionsCount < 400) {
+			if (var0.transforms != null) {
+				var0 = var0.transform();
+			}
 
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(IZII)V",
-		garbageValue = "1089471129"
-	)
-	public static final void method1781(int var0, boolean var1, int var2) {
-		if (var0 >= 8000 && var0 <= 48000) {
-			GrandExchangeOfferAgeComparator.field3633 = var0;
-			PcmPlayer.PcmPlayer_stereo = var1;
-			PcmPlayer.field181 = var2;
-		} else {
-			throw new IllegalArgumentException();
+			if (var0 != null) {
+				if (var0.isInteractable) {
+					if (!var0.isFollower || Client.followerIndex == var1) {
+						String var4 = var0.name;
+						int var7;
+						int var8;
+						if (var0.combatLevel != 0) {
+							var7 = var0.combatLevel;
+							var8 = class129.localPlayer.combatLevel;
+							int var9 = var8 - var7;
+							String var6;
+							if (var9 < -9) {
+								var6 = class54.colorStartTag(16711680);
+							} else if (var9 < -6) {
+								var6 = class54.colorStartTag(16723968);
+							} else if (var9 < -3) {
+								var6 = class54.colorStartTag(16740352);
+							} else if (var9 < 0) {
+								var6 = class54.colorStartTag(16756736);
+							} else if (var9 > 9) {
+								var6 = class54.colorStartTag(65280);
+							} else if (var9 > 6) {
+								var6 = class54.colorStartTag(4259584);
+							} else if (var9 > 3) {
+								var6 = class54.colorStartTag(8453888);
+							} else if (var9 > 0) {
+								var6 = class54.colorStartTag(12648192);
+							} else {
+								var6 = class54.colorStartTag(16776960);
+							}
+
+							var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
+						}
+
+						if (var0.isFollower && Client.followerOpsLowPriority) {
+							ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+						}
+
+						if (Client.isItemSelected == 1) {
+							ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(16776960) + var4, 7, var1, var2, var3);
+						} else if (Client.isSpellSelected) {
+							if ((ScriptFrame.selectedSpellFlags & 2) == 2) {
+								ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(16776960) + var4, 8, var1, var2, var3);
+							}
+						} else {
+							int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
+							String[] var11 = var0.actions;
+							if (var11 != null) {
+								for (var7 = 4; var7 >= 0; --var7) {
+									if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) {
+										var8 = 0;
+										if (var7 == 0) {
+											var8 = var10 + 9;
+										}
+
+										if (var7 == 1) {
+											var8 = var10 + 10;
+										}
+
+										if (var7 == 2) {
+											var8 = var10 + 11;
+										}
+
+										if (var7 == 3) {
+											var8 = var10 + 12;
+										}
+
+										if (var7 == 4) {
+											var8 = var10 + 13;
+										}
+
+										ModelData0.insertMenuItemNoShift(var11[var7], class54.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+									}
+								}
+							}
+
+							if (var11 != null) {
+								for (var7 = 4; var7 >= 0; --var7) {
+									if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) {
+										short var12 = 0;
+										if (AttackOption.AttackOption_hidden != Client.npcAttackOption) {
+											if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > class129.localPlayer.combatLevel) {
+												var12 = 2000;
+											}
+
+											var8 = 0;
+											if (var7 == 0) {
+												var8 = var12 + 9;
+											}
+
+											if (var7 == 1) {
+												var8 = var12 + 10;
+											}
+
+											if (var7 == 2) {
+												var8 = var12 + 11;
+											}
+
+											if (var7 == 3) {
+												var8 = var12 + 12;
+											}
+
+											if (var7 == 4) {
+												var8 = var12 + 13;
+											}
+
+											ModelData0.insertMenuItemNoShift(var11[var7], class54.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+										}
+									}
+								}
+							}
+
+							if (!var0.isFollower || !Client.followerOpsLowPriority) {
+								ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+							}
+						}
+
+					}
+				}
+			}
 		}
 	}
 
-	@ObfuscatedName("ku")
+	@ObfuscatedName("if")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;IIII)V",
-		garbageValue = "131255648"
+		descriptor = "(Lco;IIII)V",
+		garbageValue = "617198662"
 	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		class262.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 = MouseHandler.localPlayer.x / 32 + 48;
-				int var7 = 464 - MouseHandler.localPlayer.y / 32;
-				class376.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
+	@Export("addPlayerToMenu")
+	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
+		if (class129.localPlayer != var0) {
+			if (Client.menuOptionsCount < 400) {
+				String var4;
+				int var7;
+				if (var0.skillLevel == 0) {
+					String var5 = var0.actions[0] + var0.username + var0.actions[1];
+					var7 = var0.combatLevel;
+					int var8 = class129.localPlayer.combatLevel;
+					int var9 = var8 - var7;
+					String var6;
+					if (var9 < -9) {
+						var6 = class54.colorStartTag(16711680);
+					} else if (var9 < -6) {
+						var6 = class54.colorStartTag(16723968);
+					} else if (var9 < -3) {
+						var6 = class54.colorStartTag(16740352);
+					} else if (var9 < 0) {
+						var6 = class54.colorStartTag(16756736);
+					} else if (var9 > 9) {
+						var6 = class54.colorStartTag(65280);
+					} else if (var9 > 6) {
+						var6 = class54.colorStartTag(4259584);
+					} else if (var9 > 3) {
+						var6 = class54.colorStartTag(8453888);
+					} else if (var9 > 0) {
+						var6 = class54.colorStartTag(12648192);
+					} else {
+						var6 = class54.colorStartTag(16776960);
+					}
+
+					var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
+				} else {
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
+				}
 
-				int var8;
 				int var10;
-				int var16;
-				for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
-					var16 = Client.mapIconXs[var8] * 4 + 2 - MouseHandler.localPlayer.x / 32;
-					var10 = Client.mapIconYs[var8] * 4 + 2 - MouseHandler.localPlayer.y / 32;
-					class267.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4);
-				}
+				if (Client.isItemSelected == 1) {
+					ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(16777215) + var4, 14, var1, var2, var3);
+				} else if (Client.isSpellSelected) {
+					if ((ScriptFrame.selectedSpellFlags & 8) == 8) {
+						ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(16777215) + var4, 15, var1, var2, var3);
+					}
+				} else {
+					for (var10 = 7; var10 >= 0; --var10) {
+						if (Client.playerMenuActions[var10] != null) {
+							short var11 = 0;
+							if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
+								if (AttackOption.AttackOption_hidden == Client.playerAttackOption) {
+									continue;
+								}
 
-				int var11;
-				int var12;
-				for (var8 = 0; var8 < 104; ++var8) {
-					for (var16 = 0; var16 < 104; ++var16) {
-						NodeDeque var14 = Client.groundItems[GrandExchangeEvent.Client_plane][var8][var16];
-						if (var14 != null) {
-							var11 = var8 * 4 + 2 - MouseHandler.localPlayer.x / 32;
-							var12 = var16 * 4 + 2 - MouseHandler.localPlayer.y / 32;
-							class267.drawSpriteOnMinimap(var1, var2, var11, var12, class126.mapDotSprites[0], var4);
+								if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class129.localPlayer.combatLevel) {
+									var11 = 2000;
+								}
+
+								if (class129.localPlayer.team != 0 && var0.team != 0) {
+									if (var0.team == class129.localPlayer.team) {
+										var11 = 2000;
+									} else {
+										var11 = 0;
+									}
+								} else if (AttackOption.field1236 == Client.playerAttackOption && var0.isClanMember()) {
+									var11 = 2000;
+								}
+							} else if (Client.playerOptionsPriorities[var10]) {
+								var11 = 2000;
+							}
+
+							boolean var12 = false;
+							var7 = Client.playerMenuOpcodes[var10] + var11;
+							ModelData0.insertMenuItemNoShift(Client.playerMenuActions[var10], class54.colorStartTag(16777215) + var4, var7, var1, var2, var3);
 						}
 					}
 				}
 
-				for (var8 = 0; var8 < Client.npcCount; ++var8) {
-					NPC var9 = Client.npcs[Client.npcIndices[var8]];
-					if (var9 != null && var9.isVisible()) {
-						NPCComposition var18 = var9.definition;
-						if (var18 != null && var18.transforms != null) {
-							var18 = var18.transform();
-						}
-
-						if (var18 != null && var18.drawMapDot && var18.isInteractable) {
-							var11 = var9.x / 32 - MouseHandler.localPlayer.x / 32;
-							var12 = var9.y / 32 - MouseHandler.localPlayer.y / 32;
-							class267.drawSpriteOnMinimap(var1, var2, var11, var12, class126.mapDotSprites[1], var4);
-						}
+				for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
+					if (Client.menuOpcodes[var10] == 23) {
+						Client.menuTargets[var10] = class54.colorStartTag(16777215) + var4;
+						break;
 					}
 				}
 
-				var8 = Players.Players_count;
-				int[] var17 = Players.Players_indices;
-
-				for (var10 = 0; var10 < var8; ++var10) {
-					Player var15 = Client.players[var17[var10]];
-					if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != MouseHandler.localPlayer) {
-						var12 = var15.x / 32 - MouseHandler.localPlayer.x / 32;
-						int var13 = var15.y / 32 - MouseHandler.localPlayer.y / 32;
-						if (var15.isFriend()) {
-							class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[3], var4);
-						} else if (MouseHandler.localPlayer.team != 0 && var15.team != 0 && var15.team == MouseHandler.localPlayer.team) {
-							class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[4], var4);
-						} else if (var15.isFriendsChatMember()) {
-							class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[5], var4);
-						} else if (var15.isClanMember()) {
-							class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[6], var4);
-						} else {
-							class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[2], var4);
-						}
-					}
-				}
-
-				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
-					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
-						NPC var19 = Client.npcs[Client.hintArrowNpcIndex];
-						if (var19 != null) {
-							var11 = var19.x / 32 - MouseHandler.localPlayer.x / 32;
-							var12 = var19.y / 32 - MouseHandler.localPlayer.y / 32;
-							Varcs.worldToMinimap(var1, var2, var11, var12, FloorUnderlayDefinition.mapMarkerSprites[1], var4);
-						}
-					}
-
-					if (Client.hintArrowType == 2) {
-						var10 = Client.hintArrowX * 4 - GrandExchangeOfferNameComparator.baseX * 4 + 2 - MouseHandler.localPlayer.x / 32;
-						var11 = Client.hintArrowY * 4 - NPC.baseY * 4 + 2 - MouseHandler.localPlayer.y / 32;
-						Varcs.worldToMinimap(var1, var2, var10, var11, FloorUnderlayDefinition.mapMarkerSprites[1], var4);
-					}
-
-					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
-						Player var20 = Client.players[Client.hintArrowPlayerIndex];
-						if (var20 != null) {
-							var11 = var20.x / 32 - MouseHandler.localPlayer.x / 32;
-							var12 = var20.y / 32 - MouseHandler.localPlayer.y / 32;
-							Varcs.worldToMinimap(var1, var2, var11, var12, FloorUnderlayDefinition.mapMarkerSprites[1], var4);
-						}
-					}
-				}
-
-				if (Client.destinationX != 0) {
-					var10 = Client.destinationX * 4 + 2 - MouseHandler.localPlayer.x / 32;
-					var11 = Client.destinationY * 4 + 2 - MouseHandler.localPlayer.y / 32;
-					class267.drawSpriteOnMinimap(var1, var2, var10, var11, FloorUnderlayDefinition.mapMarkerSprites[0], var4);
-				}
-
-				if (!MouseHandler.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.field617[var3] = true;
 		}
 	}
 }

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

@@ -3,51 +3,48 @@ 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("ce")
+@ObfuscatedName("cm")
 @Implements("AttackOption")
-public enum AttackOption implements Enumerated {
-	@ObfuscatedName("s")
+public enum AttackOption implements MouseWheel {
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lce;"
+		descriptor = "Lcm;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lce;"
+		descriptor = "Lcm;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lce;"
+		descriptor = "Lcm;"
 	)
-	field1156(2),
-	@ObfuscatedName("j")
+	field1238(2),
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lce;"
+		descriptor = "Lcm;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3),
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lce;"
+		descriptor = "Lcm;"
 	)
-	field1157(4);
+	field1236(4);
 
-	@ObfuscatedName("k")
-	static int[] field1161;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 1465894369
+	@ObfuscatedName("qg")
+	@ObfuscatedSignature(
+		descriptor = "Ldi;"
 	)
-	@Export("cacheGamebuild")
-	static int cacheGamebuild;
-	@ObfuscatedName("n")
+	@Export("guestClanSettings")
+	static ClanSettings guestClanSettings;
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -641800473
+		intValue = 867300587
 	)
 	@Export("id")
 	final int id;
@@ -56,132 +53,309 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1806959663"
+		garbageValue = "-1665712539"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-474179746"
+		descriptor = "(Ljava/lang/CharSequence;IZB)Z",
+		garbageValue = "80"
 	)
-	public static int method2006(int var0) {
-		return class345.field3941[var0 & 16383];
-	}
+	static boolean method2254(CharSequence var0, int var1, boolean var2) {
+		if (var1 >= 2 && var1 <= 36) {
+			boolean var3 = false;
+			boolean var4 = false;
+			int var5 = 0;
+			int var6 = var0.length();
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-191139997"
-	)
-	static void method2005() {
-		if (Login.Login_username == null || Login.Login_username.length() <= 0) {
-			if (Decimator.clientPreferences.rememberedUsername != null) {
-				Login.Login_username = Decimator.clientPreferences.rememberedUsername;
-				Client.Login_isUsernameRemembered = true;
-			} else {
-				Client.Login_isUsernameRemembered = false;
+			for (int var7 = 0; var7 < var6; ++var7) {
+				char var8 = var0.charAt(var7);
+				if (var7 == 0) {
+					if (var8 == '-') {
+						var3 = true;
+						continue;
+					}
+
+					if (var8 == '+') {
+						continue;
+					}
+				}
+
+				int var10;
+				if (var8 >= '0' && var8 <= '9') {
+					var10 = var8 - '0';
+				} else if (var8 >= 'A' && var8 <= 'Z') {
+					var10 = var8 - '7';
+				} else {
+					if (var8 < 'a' || var8 > 'z') {
+						return false;
+					}
+
+					var10 = var8 - 'W';
+				}
+
+				if (var10 >= var1) {
+					return false;
+				}
+
+				if (var3) {
+					var10 = -var10;
+				}
+
+				int var9 = var5 * var1 + var10;
+				if (var9 / var1 != var5) {
+					return false;
+				}
+
+				var5 = var9;
+				var4 = true;
 			}
 
-		}
-	}
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "148408733"
-	)
-	static int method1994(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget;
-		if (var0 == ScriptOpcodes.CC_GETX) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETY) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height;
-			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;
+			return var4;
 		} else {
-			return 2;
+			throw new IllegalArgumentException("" + var1);
 		}
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lem;I)Z",
-		garbageValue = "-1661175610"
+		descriptor = "([BI)Lbg;",
+		garbageValue = "-1523134564"
 	)
-	static boolean method2003(ObjectComposition var0) {
-		if (var0.transforms != null) {
-			int[] var1 = var0.transforms;
+	@Export("newScript")
+	static Script newScript(byte[] var0) {
+		Script var1 = new Script();
+		Buffer var2 = new Buffer(var0);
+		var2.offset = var2.array.length - 2;
+		int var3 = var2.readUnsignedShort();
+		int var4 = var2.array.length - 2 - var3 - 12;
+		var2.offset = var4;
+		int var5 = var2.readInt();
+		var1.localIntCount = var2.readUnsignedShort();
+		var1.localStringCount = var2.readUnsignedShort();
+		var1.intArgumentCount = var2.readUnsignedShort();
+		var1.stringArgumentCount = var2.readUnsignedShort();
+		int var6 = var2.readUnsignedByte();
+		int var7;
+		int var8;
+		if (var6 > 0) {
+			var1.switches = var1.newIterableNodeHashTable(var6);
 
-			for (int var2 = 0; var2 < var1.length; ++var2) {
-				int var3 = var1[var2];
-				ObjectComposition var4 = ClanChannel.getObjectDefinition(var3);
-				if (var4.mapIconId != -1) {
-					return true;
+			for (var7 = 0; var7 < var6; ++var7) {
+				var8 = var2.readUnsignedShort();
+				IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? ItemContainer.method2041(var8) : 1);
+				var1.switches[var7] = var9;
+
+				while (var8-- > 0) {
+					int var10 = var2.readInt();
+					int var11 = var2.readInt();
+					var9.put(new IntegerNode(var11), (long)var10);
 				}
 			}
-		} else if (var0.mapIconId != -1) {
-			return true;
 		}
 
-		return false;
-	}
+		var2.offset = 0;
+		var1.field941 = var2.readStringCp1252NullTerminatedOrNull();
+		var1.opcodes = new int[var5];
+		var1.intOperands = new int[var5];
+		var1.stringOperands = new String[var5];
 
-	@ObfuscatedName("im")
-	@ObfuscatedSignature(
-		descriptor = "([Lio;Lio;ZI)V",
-		garbageValue = "-262719970"
-	)
-	@Export("revalidateWidgetScroll")
-	static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
-		int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1852896115 * 13396411 : var1.width * 1408116923 * -396764045;
-		int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1927321653 * -2086667747 : var1.height * 1272528565 * 1874739101;
-		FaceNormal.resizeInterface(var0, var1.id, var3, var4, var2);
-		if (var1.children != null) {
-			FaceNormal.resizeInterface(var1.children, var1.id, var3, var4, var2);
-		}
-
-		InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id);
-		if (var5 != null) {
-			int var6 = var5.group;
-			if (Huffman.loadInterface(var6)) {
-				FaceNormal.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2);
+		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) {
+			var8 = var2.readUnsignedShort();
+			if (var8 == 3) {
+				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+				var1.intOperands[var7] = var2.readInt();
+			} else {
+				var1.intOperands[var7] = var2.readUnsignedByte();
 			}
 		}
 
-		if (var1.contentType == 1337) {
+		return var1;
+	}
+
+	@ObfuscatedName("hn")
+	@ObfuscatedSignature(
+		descriptor = "(Loq;B)V",
+		garbageValue = "28"
+	)
+	static final void method2255(PacketBuffer var0) {
+		for (int var1 = 0; var1 < Client.field560; ++var1) {
+			int var2 = Client.field533[var1];
+			NPC var3 = Client.npcs[var2];
+			int var4 = var0.readUnsignedByte();
+			if ((var4 & 64) != 0) {
+				var3.definition = ScriptEvent.getNpcDefinition(var0.method6853());
+				var3.field1137 = var3.definition.size;
+				var3.field1146 = var3.definition.rotation;
+				var3.walkSequence = var3.definition.walkSequence;
+				var3.walkBackSequence = var3.definition.walkBackSequence;
+				var3.walkLeftSequence = var3.definition.walkLeftSequence;
+				var3.walkRightSequence = var3.definition.walkRightSequence;
+				var3.idleSequence = var3.definition.idleSequence;
+				var3.turnLeftSequence = var3.definition.turnLeftSequence;
+				var3.turnRightSequence = var3.definition.turnRightSequence;
+			}
+
+			int var5;
+			int var6;
+			int var7;
+			if ((var4 & 128) != 0) {
+				var5 = var0.method6853();
+				if (var5 == 65535) {
+					var5 = -1;
+				}
+
+				var6 = var0.readUnsignedByte();
+				if (var5 == var3.sequence && var5 != -1) {
+					var7 = class17.SequenceDefinition_get(var5).field1961;
+					if (var7 == 1) {
+						var3.sequenceFrame = 0;
+						var3.sequenceFrameCycle = 0;
+						var3.sequenceDelay = var6;
+						var3.field1099 = 0;
+					}
+
+					if (var7 == 2) {
+						var3.field1099 = 0;
+					}
+				} else if (var5 == -1 || var3.sequence == -1 || class17.SequenceDefinition_get(var5).field1955 >= class17.SequenceDefinition_get(var3.sequence).field1955) {
+					var3.sequence = var5;
+					var3.sequenceFrame = 0;
+					var3.sequenceFrameCycle = 0;
+					var3.sequenceDelay = var6;
+					var3.field1099 = 0;
+					var3.field1152 = var3.pathLength;
+				}
+			}
+
+			int var8;
+			if ((var4 & 1) != 0) {
+				var5 = var0.method6940();
+				var6 = var0.method6940();
+				var7 = var3.x - (var5 - FloorOverlayDefinition.baseX - FloorOverlayDefinition.baseX) * 64;
+				var8 = var3.y - (var6 - class320.baseY - class320.baseY) * 64;
+				if (var7 != 0 || var8 != 0) {
+					var3.field1096 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
+				}
+			}
+
+			if ((var4 & 32) != 0) {
+				var3.spotAnimation = var0.readUnsignedShort();
+				var5 = var0.readInt();
+				var3.field1134 = var5 >> 16;
+				var3.field1133 = (var5 & 65535) + Client.cycle;
+				var3.spotAnimationFrame = 0;
+				var3.spotAnimationFrameCycle = 0;
+				if (var3.field1133 > Client.cycle) {
+					var3.spotAnimationFrame = -1;
+				}
+
+				if (var3.spotAnimation == 65535) {
+					var3.spotAnimation = -1;
+				}
+			}
+
+			if ((var4 & 16) != 0) {
+				var3.overheadText = var0.readStringCp1252NullTerminated();
+				var3.overheadTextCyclesRemaining = 100;
+			}
+
+			if ((var4 & 4) != 0) {
+				var3.field1135 = var0.readByte();
+				var3.field1141 = var0.method6848();
+				var3.field1121 = var0.method6901();
+				var3.field1110 = var0.method6901();
+				var3.field1139 = var0.method6940() + Client.cycle;
+				var3.field1140 = var0.method6855() + Client.cycle;
+				var3.field1101 = var0.method6853();
+				var3.pathLength = 1;
+				var3.field1152 = 0;
+				var3.field1135 += var3.pathX[0];
+				var3.field1141 += var3.pathY[0];
+				var3.field1121 += var3.pathX[0];
+				var3.field1110 += var3.pathY[0];
+			}
+
+			if ((var4 & 8) != 0) {
+				var3.targetIndex = var0.readUnsignedShort();
+				if (var3.targetIndex == 65535) {
+					var3.targetIndex = -1;
+				}
+			}
+
+			if ((var4 & 2) != 0) {
+				var5 = var0.method7007();
+				int var9;
+				int var10;
+				int var11;
+				if (var5 > 0) {
+					for (var6 = 0; var6 < var5; ++var6) {
+						var8 = -1;
+						var9 = -1;
+						var10 = -1;
+						var7 = var0.readUShortSmart();
+						if (var7 == 32767) {
+							var7 = var0.readUShortSmart();
+							var9 = var0.readUShortSmart();
+							var8 = var0.readUShortSmart();
+							var10 = var0.readUShortSmart();
+						} else if (var7 != 32766) {
+							var9 = var0.readUShortSmart();
+						} else {
+							var7 = -1;
+						}
+
+						var11 = var0.readUShortSmart();
+						var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
+					}
+				}
+
+				var6 = var0.method6844();
+				if (var6 > 0) {
+					for (var7 = 0; var7 < var6; ++var7) {
+						var8 = var0.readUShortSmart();
+						var9 = var0.readUShortSmart();
+						if (var9 != 32767) {
+							var10 = var0.readUShortSmart();
+							var11 = var0.method6849();
+							int var12 = var9 > 0 ? var0.method6844() : var11;
+							var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
+						} else {
+							var3.removeHealthBar(var8);
+						}
+					}
+				}
+			}
 		}
 
 	}
 
-	@ObfuscatedName("jp")
+	@ObfuscatedName("kp")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;I)V",
-		garbageValue = "1411916800"
+		descriptor = "(IIZI)V",
+		garbageValue = "2055549575"
 	)
-	@Export("invalidateWidget")
-	static void invalidateWidget(Widget var0) {
-		if (var0.cycle == Client.field615) {
-			Client.field616[var0.rootIndex] = true;
+	static final void method2253(int var0, int var1, boolean var2) {
+		if (Client.currentClanChannels[var0] != null) {
+			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2677()) {
+				ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1);
+				PacketWriter var4 = Client.packetWriter;
+				PacketBufferNode var5 = FriendSystem.getPacketBufferNode(ClientPacket.field2666, var4.isaacCipher);
+				var5.packetBuffer.writeByte(4 + BufferedSink.stringCp1252NullTerminatedByteSize(var3.username.getName()));
+				var5.packetBuffer.writeByte(var0);
+				var5.packetBuffer.writeShort(var1);
+				var5.packetBuffer.writeBoolean(var2);
+				var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName());
+				var4.addNode(var5);
+			}
 		}
-
 	}
 }

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("az")
+@ObfuscatedName("ax")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("n")
-	static float[][] field318;
-	@ObfuscatedName("w")
+	@ObfuscatedName("g")
+	static float[][] field399;
+	@ObfuscatedName("z")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("f")
-	static float field311;
-	@ObfuscatedName("o")
+	@ObfuscatedName("a")
+	static float field401;
+	@ObfuscatedName("u")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("v")
-	int[][][] field313;
-	@ObfuscatedName("j")
-	int[][][] field314;
-	@ObfuscatedName("l")
-	int[] field315;
+	@ObfuscatedName("m")
+	int[][][] field396;
+	@ObfuscatedName("k")
+	int[][][] field403;
+	@ObfuscatedName("o")
+	int[] field398;
 
 	static {
-		field318 = new float[2][8];
+		field399 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field313 = new int[2][2][4];
-		this.field314 = new int[2][2][4];
-		this.field315 = new int[2];
+		this.field396 = new int[2][2][4];
+		this.field403 = new int[2][2][4];
+		this.field398 = new int[2];
 	}
 
-	@ObfuscatedName("s")
-	float method822(int var1, int var2, float var3) {
-		float var4 = (float)this.field314[var1][0][var2] + var3 * (float)(this.field314[var1][1][var2] - this.field314[var1][0][var2]);
+	@ObfuscatedName("n")
+	float method1054(int var1, int var2, float var3) {
+		float var4 = (float)this.field403[var1][0][var2] + var3 * (float)(this.field403[var1][1][var2] - this.field403[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("v")
-	float method809(int var1, int var2, float var3) {
-		float var4 = (float)this.field313[var1][0][var2] + var3 * (float)(this.field313[var1][1][var2] - this.field313[var1][0][var2]);
+	@ObfuscatedName("m")
+	float method1055(int var1, int var2, float var3) {
+		float var4 = (float)this.field396[var1][0][var2] + var3 * (float)(this.field396[var1][1][var2] - this.field396[var1][0][var2]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field315[0] + (float)(this.field315[1] - this.field315[0]) * var2;
+			var3 = (float)this.field398[0] + (float)(this.field398[1] - this.field398[0]) * var2;
 			var3 *= 0.0030517578F;
-			field311 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field311 * 65536.0F);
+			field401 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			forwardMultiplier = (int)(field401 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method822(var1, 0, var2);
-			field318[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method809(var1, 0, var2));
-			field318[var1][1] = var3 * var3;
+			var3 = this.method1054(var1, 0, var2);
+			field399[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, 0, var2));
+			field399[var1][1] = var3 * var3;
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method822(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method809(var1, var4, var2));
+				var3 = this.method1054(var1, var4, var2);
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, var4, var2));
 				float var6 = var3 * var3;
-				field318[var1][var4 * 2 + 1] = field318[var1][var4 * 2 - 1] * var6;
-				field318[var1][var4 * 2] = field318[var1][var4 * 2 - 1] * var5 + field318[var1][var4 * 2 - 2] * var6;
+				field399[var1][var4 * 2 + 1] = field399[var1][var4 * 2 - 1] * var6;
+				field399[var1][var4 * 2] = field399[var1][var4 * 2 - 1] * var5 + field399[var1][var4 * 2 - 2] * var6;
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field318[var1];
-					var10000[var7] += field318[var1][var7 - 1] * var5 + field318[var1][var7 - 2] * var6;
+					var10000 = field399[var1];
+					var10000[var7] += field399[var1][var7 - 1] * var5 + field399[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field318[var1];
-				var10000[1] += field318[var1][0] * var5 + var6;
-				var10000 = field318[var1];
+				var10000 = field399[var1];
+				var10000[1] += field399[var1][0] * var5 + var6;
+				var10000 = field399[var1];
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field318[0];
-					var10000[var4] *= field311;
+					var10000 = field399[0];
+					var10000[var4] *= field401;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field318[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field399[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2;
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;Lg;)V"
+		descriptor = "(Lot;Lau;)V"
 	)
-	final void method812(Buffer var1, SoundEnvelope var2) {
+	final void method1057(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field315[0] = var1.readUnsignedShort();
-			this.field315[1] = var1.readUnsignedShort();
+			this.field398[0] = var1.readUnsignedShort();
+			this.field398[1] = var1.readUnsignedShort();
 			int var7 = var1.readUnsignedByte();
 
 			int var5;
 			int var6;
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
-					this.field313[var5][0][var6] = var1.readUnsignedShort();
-					this.field314[var5][0][var6] = var1.readUnsignedShort();
+					this.field396[var5][0][var6] = var1.readUnsignedShort();
+					this.field403[var5][0][var6] = var1.readUnsignedShort();
 				}
 			}
 
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
 					if ((var7 & 1 << var5 * 4 << var6) != 0) {
-						this.field313[var5][1][var6] = var1.readUnsignedShort();
-						this.field314[var5][1][var6] = var1.readUnsignedShort();
+						this.field396[var5][1][var6] = var1.readUnsignedShort();
+						this.field403[var5][1][var6] = var1.readUnsignedShort();
 					} else {
-						this.field313[var5][1][var6] = this.field313[var5][0][var6];
-						this.field314[var5][1][var6] = this.field314[var5][0][var6];
+						this.field396[var5][1][var6] = this.field396[var5][0][var6];
+						this.field403[var5][1][var6] = this.field403[var5][0][var6];
 					}
 				}
 			}
 
-			if (var7 != 0 || this.field315[1] != this.field315[0]) {
+			if (var7 != 0 || this.field398[1] != this.field398[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var4 = this.field315;
-			this.field315[1] = 0;
+			int[] var4 = this.field398;
+			this.field398[1] = 0;
 			var4[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@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,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("na")
+@ObfuscatedName("oz")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lnn;"
+		descriptor = "Low;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@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.field4196 = 0;
+			BZip2Decompressor_state.field4306 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;)V"
+		descriptor = "(Low;)V"
 	)
-	static void method6909(BZip2State var0) {
+	static void method7048(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = BufferedSink.BZip2Decompressor_block;
-		int var7 = var0.field4203;
+		int[] var6 = FloorOverlayDefinition.BZip2Decompressor_block;
+		int var7 = var0.field4283;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field4207 + 1;
+		int var12 = var0.field4312 + 1;
 
 		label70:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field4196;
-		var0.field4196 += var10 - var10;
-		if (var0.field4196 < var13) {
+		int var13 = var0.field4306;
+		var0.field4306 += var10 - var10;
+		if (var0.field4306 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		BufferedSink.BZip2Decompressor_block = var6;
-		var0.field4203 = var7;
+		FloorOverlayDefinition.BZip2Decompressor_block = var6;
+		var0.field4283 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;)V"
+		descriptor = "(Low;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -192,9 +192,9 @@ public final class BZip2Decompressor {
 		int[] var23 = null;
 		int[] var24 = null;
 		int[] var25 = null;
-		var0.blockSize100k = 536353965;
-		if (BufferedSink.BZip2Decompressor_block == null) {
-			BufferedSink.BZip2Decompressor_block = new int[var0.blockSize100k * 669701408];
+		var0.blockSize100k = -1821758279;
+		if (FloorOverlayDefinition.BZip2Decompressor_block == null) {
+			FloorOverlayDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * -1191793760];
 		}
 
 		boolean var26 = true;
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++;
-							BufferedSink.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							FloorOverlayDefinition.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) {
-								BufferedSink.BZip2Decompressor_block[var47] = var1 & 255;
+								FloorOverlayDefinition.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(BufferedSink.BZip2Decompressor_block[var36] & 255);
-						var10000 = BufferedSink.BZip2Decompressor_block;
+						var1 = (byte)(FloorOverlayDefinition.BZip2Decompressor_block[var36] & 255);
+						var10000 = FloorOverlayDefinition.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field4203 = BufferedSink.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field4283 = FloorOverlayDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field4203 = BufferedSink.BZip2Decompressor_block[var0.field4203];
-					var0.su_ch2 = (byte)(var0.field4203 & 255);
-					var0.field4203 >>= 8;
+					var0.field4283 = FloorOverlayDefinition.BZip2Decompressor_block[var0.field4283];
+					var0.su_ch2 = (byte)(var0.field4283 & 255);
+					var0.field4283 >>= 8;
 					++var0.nblocks_used;
-					var0.field4207 = var47;
-					method6909(var0);
-					if (var0.field4207 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					var0.field4312 = var47;
+					method7048(var0);
+					if (var0.field4312 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;)B"
+		descriptor = "(Low;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;)B"
+		descriptor = "(Low;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(ILnn;)I"
+		descriptor = "(ILow;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;)V"
+		descriptor = "(Low;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@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("nn")
+@ObfuscatedName("ow")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("s")
-	final int field4213;
-	@ObfuscatedName("t")
-	final int field4185;
-	@ObfuscatedName("v")
-	final int field4193;
-	@ObfuscatedName("j")
-	final int field4186;
-	@ObfuscatedName("l")
-	final int field4188;
 	@ObfuscatedName("n")
-	final int field4189;
-	@ObfuscatedName("w")
+	final int field4304;
+	@ObfuscatedName("c")
+	final int field4276;
+	@ObfuscatedName("m")
+	final int field4277;
+	@ObfuscatedName("k")
+	final int field4278;
+	@ObfuscatedName("o")
+	final int field4302;
+	@ObfuscatedName("g")
+	final int field4294;
+	@ObfuscatedName("z")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1167904443
+		intValue = 53952311
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 2140718727
+		intValue = 1797738761
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 152058377
+		intValue = 1463304683
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 720811517
+		intValue = -1546879961
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1102451059
+		intValue = -11358323
 	)
-	int field4196;
-	@ObfuscatedName("k")
+	int field4306;
+	@ObfuscatedName("f")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1797318969
+		intValue = -2114937873
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 577319637
+		intValue = -1611306341
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -844578273
+		intValue = 679904065
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("c")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2013367365
+		intValue = -2078278977
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1202872339
+		intValue = 1213180761
 	)
-	int field4203;
-	@ObfuscatedName("m")
+	int field4283;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -382061133
+		intValue = 1191633685
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("z")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 464515415
+		intValue = -607408647
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1433904183
+		intValue = 1443990071
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aq")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ad")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("am")
+	@ObfuscatedName("al")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("al")
+	@ObfuscatedName("aa")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("aw")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("at")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("as")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ae")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("au")
+	@ObfuscatedName("av")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("av")
+	@ObfuscatedName("ak")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("as")
+	@ObfuscatedName("an")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("az")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = 498963667
+		intValue = -1858865351
 	)
-	int field4207;
+	int field4312;
 
 	BZip2State() {
-		this.field4213 = 4096;
-		this.field4185 = 16;
-		this.field4193 = 258;
-		this.field4186 = 6;
-		this.field4188 = 50;
-		this.field4189 = 18002;
+		this.field4304 = 4096;
+		this.field4276 = 16;
+		this.field4277 = 258;
+		this.field4278 = 6;
+		this.field4302 = 50;
+		this.field4294 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -178,4 +179,38 @@ public final class BZip2State {
 		this.perm = new int[6][258];
 		this.minLens = new int[6];
 	}
+
+	@ObfuscatedName("iu")
+	@ObfuscatedSignature(
+		descriptor = "(Ljd;I)Z",
+		garbageValue = "-1069894209"
+	)
+	@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 = class9.method90(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 (var3 != var2) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}
 }

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

@@ -4,72 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hs")
+@ObfuscatedName("hn")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("tr")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1924657947
-	)
-	@Export("foundItemIdCount")
-	static int foundItemIdCount;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "Lae;"
-	)
-	@Export("soundSystem")
-	static SoundSystem soundSystem;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1178102363
+		intValue = -1585144359
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 2140931437
+		intValue = 615772211
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -691288565
+		intValue = -961076053
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -287218543
+		intValue = 697476863
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 780112513
+		intValue = -1786552595
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lgy;"
+		descriptor = "Lhr;"
 	)
 	@Export("renderable1")
 	public Renderable renderable1;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lgy;"
+		descriptor = "Lhr;"
 	)
 	@Export("renderable2")
 	public Renderable renderable2;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = -849579815865927251L
+		longValue = 570291309614965945L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1574259549
+		intValue = 1509654997
 	)
 	@Export("flags")
 	int flags;

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

@@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lo")
+@ObfuscatedName("mt")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("hu")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1950621809
-	)
-	@Export("cameraY")
-	static int cameraY;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1616481157
+		intValue = -2576511
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -531404143
+		intValue = 1191189267
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 640928203
+		intValue = -1359495181
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 566469983
+		intValue = -18291391
 	)
 	@Export("highY")
 	public int highY;
@@ -47,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-457088307"
+		garbageValue = "1032110275"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -58,10 +52,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "0"
+		descriptor = "(III)V",
+		garbageValue = "1500851381"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -69,31 +63,40 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Llo;Llo;I)V",
-		garbageValue = "1358187891"
+		descriptor = "(III)Z",
+		garbageValue = "-1261936501"
 	)
-	public void method6028(Bounds var1, Bounds var2) {
-		this.method6030(var1, var2);
-		this.method6036(var1, var2);
+	public boolean method6186(int var1, int var2) {
+		return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Llo;Llo;S)V",
-		garbageValue = "1205"
+		descriptor = "(Lmt;Lmt;I)V",
+		garbageValue = "1284684656"
 	)
-	void method6030(Bounds var1, Bounds var2) {
+	public void method6191(Bounds var1, Bounds var2) {
+		this.method6192(var1, var2);
+		this.method6196(var1, var2);
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lmt;Lmt;I)V",
+		garbageValue = "-1884423732"
+	)
+	void method6192(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
-			var2.highX = (var2.highX * -586279965 - (var1.lowX * -586279965 - this.lowX * -586279965)) * 640928203;
+			var2.highX = (var2.highX * 432140603 - (var1.lowX * 432140603 - this.lowX * 432140603)) * -1359495181;
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method6031() > var1.method6031()) {
-			var2.highX -= var2.method6031() - var1.method6031();
+		if (var2.method6195() > var1.method6195()) {
+			var2.highX -= var2.method6195() - var1.method6195();
 		}
 
 		if (var2.highX < 0) {
@@ -102,21 +105,21 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Llo;Llo;B)V",
-		garbageValue = "-48"
+		descriptor = "(Lmt;Lmt;I)V",
+		garbageValue = "-2054192714"
 	)
-	void method6036(Bounds var1, Bounds var2) {
+	void method6196(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
-			var2.highY = (var2.highY * 1464727199 - (var1.lowY * 1464727199 - this.lowY * 1464727199)) * 566469983;
+			var2.highY = (var2.highY * 1487841985 - (var1.lowY * 1487841985 - this.lowY * 1487841985)) * -18291391;
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method6032() > var1.method6032()) {
-			var2.highY -= var2.method6032() - var1.method6032();
+		if (var2.method6194() > var1.method6194()) {
+			var2.highY -= var2.method6194() - var1.method6194();
 		}
 
 		if (var2.highY < 0) {
@@ -125,22 +128,22 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1525436179"
+		garbageValue = "1761528671"
 	)
-	int method6031() {
+	int method6195() {
 		return this.lowX + this.highX;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1505514692"
+		descriptor = "(S)I",
+		garbageValue = "16384"
 	)
-	int method6032() {
-		return this.highY + this.lowY;
+	int method6194() {
+		return this.lowY + this.highY;
 	}
 
 	public String toString() {

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

@@ -3,36 +3,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("lr")
+@ObfuscatedName("mm")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -762727507
-	)
-	static int field3863;
-	@ObfuscatedName("ew")
-	@ObfuscatedGetter(
-		intValue = 1158141189
-	)
-	static int field3869;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 1892581067
+		intValue = 382223653
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -2065584103
+		intValue = 1852682519
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1763927129
+		intValue = -775599793
 	)
 	@Export("rank")
 	public int rank;
@@ -41,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-1547943293"
+		garbageValue = "-892218760"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -52,61 +41,23 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-270823036"
+		garbageValue = "1235616558"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-2044352564"
+		garbageValue = "-478268789"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZB)I",
-		garbageValue = "-1"
-	)
-	static int method5914(int var0, Script var1, boolean var2) {
-		Widget var5;
-		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) {
-			var5 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) {
-			var5 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			if (var5.itemId != -1) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_HASSUB) {
-			int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3);
-			if (var4 != null) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTOP) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface;
-			return 1;
-		} else {
-			return 2;
-		}
-	}
 }

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

@@ -2,20 +2,12 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cv")
+@ObfuscatedName("db")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("u")
-	@Export("cacheParentPaths")
-	static String[] cacheParentPaths;
-	@ObfuscatedName("bl")
-	@ObfuscatedSignature(
-		descriptor = "Lof;"
-	)
-	@Export("worldSelectRightSprite")
-	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -23,10 +15,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Llr;Llr;I)I",
-		garbageValue = "1581905870"
+		descriptor = "(Lmm;Lmm;I)I",
+		garbageValue = "1027451516"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -41,12 +33,176 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("jx")
-	static final void method2200(double var0) {
-		Rasterizer3D.Rasterizer3D_setBrightness(var0);
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0);
-		ItemComposition.ItemDefinition_cachedSprites.clear();
-		Decimator.clientPreferences.field1117 = var0;
-		MilliClock.savePreferences();
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
+		garbageValue = "28"
+	)
+	public static String method2456(CharSequence var0) {
+		long var3 = 0L;
+		int var5 = var0.length();
+
+		for (int var6 = 0; var6 < var5; ++var6) {
+			var3 *= 37L;
+			char var7 = var0.charAt(var6);
+			if (var7 >= 'A' && var7 <= 'Z') {
+				var3 += (long)(var7 + 1 - 65);
+			} else if (var7 >= 'a' && var7 <= 'z') {
+				var3 += (long)(var7 + 1 - 97);
+			} else if (var7 >= '0' && var7 <= '9') {
+				var3 += (long)(var7 + 27 - 48);
+			}
+
+			if (var3 >= 177917621779460413L) {
+				break;
+			}
+		}
+
+		while (0L == var3 % 37L && var3 != 0L) {
+			var3 /= 37L;
+		}
+
+		String var8 = UserComparator8.base37DecodeLong(var3);
+		if (var8 == null) {
+			var8 = "";
+		}
+
+		return var8;
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "5"
+	)
+	static int method2457(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.SOUND_SYNTH) {
+			class240.Interpreter_intStackSize -= 3;
+			PcmPlayer.queueSoundEffect(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]);
+			return 1;
+		} else if (var0 == ScriptOpcodes.SOUND_SONG) {
+			FriendSystem.playSong(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]);
+			return 1;
+		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
+			class240.Interpreter_intStackSize -= 2;
+			class196.method3819(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]);
+			return 1;
+		} else {
+			int var3;
+			int var4;
+			if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) {
+				if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) {
+					return 2;
+				} else {
+					var3 = 0;
+					var4 = 0;
+					if (var0 == 3210) {
+						var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					} else if (var0 == 3182) {
+						var3 = 6;
+					} else if (var0 == 3204) {
+						var3 = 7;
+					} else if (var0 == 3206) {
+						var3 = 8;
+					} else if (var0 == 3208) {
+						var3 = 9;
+					}
+
+					if (var3 == 6) {
+						float var5 = ((float)VarbitComposition.clientPreferences.field1193 - 0.5F) * 200.0F;
+						var4 = 100 - Math.round(var5);
+					} else if (var3 == 7) {
+						var4 = Math.round((float)VarbitComposition.clientPreferences.musicVolume / 2.55F);
+					} else if (var3 == 8) {
+						var4 = Math.round((float)VarbitComposition.clientPreferences.soundEffectsVolume / 1.27F);
+					} else if (var3 == 9) {
+						var4 = Math.round((float)VarbitComposition.clientPreferences.areaSoundEffectsVolume / 1.27F);
+					}
+
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4;
+					return 1;
+				}
+			} else {
+				var3 = 0;
+				var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				if (var0 == 3209) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				} else if (var0 == 3181) {
+					var3 = 6;
+				} else if (var0 == 3203) {
+					var3 = 7;
+				} else if (var0 == 3205) {
+					var3 = 8;
+				} else if (var0 == 3207) {
+					var3 = 9;
+				}
+
+				if (var3 == 6) {
+					var4 = 100 - Math.min(Math.max(var4, 0), 100);
+					Varps.method4858((double)(0.5F + (float)var4 / 200.0F));
+				} else if (var3 == 7) {
+					var4 = Math.min(Math.max(var4, 0), 100);
+					WorldMapIcon_1.method3406(Math.round(2.55F * (float)var4));
+				} else if (var3 == 8) {
+					var4 = Math.min(Math.max(var4, 0), 100);
+					class17.updateSoundEffectVolume(Math.round((float)var4 * 1.27F));
+				} else if (var3 == 9) {
+					var4 = Math.min(Math.max(var4, 0), 100);
+					WorldMapDecorationType.method5062(Math.round((float)var4 * 1.27F));
+				}
+
+				return 1;
+			}
+		}
+	}
+
+	@ObfuscatedName("fw")
+	@ObfuscatedSignature(
+		descriptor = "(Ljd;III)V",
+		garbageValue = "1481509956"
+	)
+	@Export("checkIfMinimapClicked")
+	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
+		if (Client.minimapState == 0 || Client.minimapState == 3) {
+			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
+				SpriteMask var3 = var0.getSpriteMask(true);
+				if (var3 == null) {
+					return;
+				}
+
+				int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
+				int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
+				if (var3.contains(var4, var5)) {
+					var4 -= var3.width / 2;
+					var5 -= var3.height / 2;
+					int var6 = Client.camAngleY & 2047;
+					int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
+					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
+					int var9 = var5 * var7 + var8 * var4 >> 11;
+					int var10 = var8 * var5 - var4 * var7 >> 11;
+					int var11 = var9 + class129.localPlayer.x >> 7;
+					int var12 = class129.localPlayer.y - var10 >> 7;
+					PacketBufferNode var13 = FriendSystem.getPacketBufferNode(ClientPacket.field2687, Client.packetWriter.isaacCipher);
+					var13.packetBuffer.writeByte(18);
+					var13.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+					var13.packetBuffer.method6951(var11 + FloorOverlayDefinition.baseX);
+					var13.packetBuffer.method6852(var12 + class320.baseY);
+					var13.packetBuffer.writeByte(var4);
+					var13.packetBuffer.writeByte(var5);
+					var13.packetBuffer.writeShort(Client.camAngleY);
+					var13.packetBuffer.writeByte(57);
+					var13.packetBuffer.writeByte(0);
+					var13.packetBuffer.writeByte(0);
+					var13.packetBuffer.writeByte(89);
+					var13.packetBuffer.writeShort(class129.localPlayer.x);
+					var13.packetBuffer.writeShort(class129.localPlayer.y);
+					var13.packetBuffer.writeByte(63);
+					Client.packetWriter.addNode(var13);
+					Client.destinationX = var11;
+					Client.destinationY = var12;
+				}
+			}
+
+		}
 	}
 }

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

@@ -6,72 +6,77 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nh")
+@ObfuscatedName("nm")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("t")
+	@ObfuscatedName("ma")
 	@ObfuscatedSignature(
-		descriptor = "Lnx;"
+		descriptor = "Ljd;"
+	)
+	static Widget field4227;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lnn;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		longValue = -3766885552873211485L
+		longValue = 8206064440488696005L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2139615801
+		intValue = 1254832925
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		longValue = 8976089063381266933L
+		longValue = 506713374014136899L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -490411647
+		intValue = 823949627
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		longValue = -6685793384620451399L
+		longValue = 7790686159451358409L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = -514668632289479539L
+		longValue = -8317105703859247781L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = -7669073227626038819L
+		longValue = 7928376794679611023L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = -7913431712246831653L
+		longValue = -757931167523736079L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnx;II)V"
+		descriptor = "(Lnn;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L;
@@ -84,10 +89,10 @@ public class BufferedFile {
 		this.offset = 0L;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1641755692"
+		garbageValue = "2076443920"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +100,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +110,30 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(S)J",
-		garbageValue = "17997"
+		descriptor = "(I)J",
+		garbageValue = "-2099074998"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "([BI)V",
-		garbageValue = "1754869480"
+		descriptor = "([BB)V",
+		garbageValue = "-114"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)V",
-		garbageValue = "-1776253078"
+		descriptor = "([BIIB)V",
+		garbageValue = "-67"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +142,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			if (-1L != this.writeBufferOffset && 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;
@@ -206,10 +211,10 @@ public class BufferedFile {
 					var13 = var4;
 				}
 
-				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) {
+				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) {
 					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
-				} else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) {
-					var10 = var4 + (long)var7;
+				} else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) {
+					var10 = (long)var7 + var4;
 				}
 
 				if (var13 > -1L && var10 > var13) {
@@ -231,10 +236,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1420179054"
+		garbageValue = "1025800655"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -261,15 +266,15 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
-		garbageValue = "-59"
+		descriptor = "([BIII)V",
+		garbageValue = "171199220"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		try {
-			if ((long)var3 + this.offset > this.length) {
+			if (this.offset + (long)var3 > this.length) {
 				this.length = this.offset + (long)var3;
 			}
 
@@ -277,7 +282,7 @@ public class BufferedFile {
 				this.flush();
 			}
 
-			if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) {
+			if (-1L != this.writeBufferOffset && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) {
 				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 +294,7 @@ public class BufferedFile {
 
 			if (var3 <= this.writeBuffer.length) {
 				if (var3 > 0) {
-					if (this.writeBufferOffset == -1L) {
+					if (-1L == this.writeBufferOffset) {
 						this.writeBufferOffset = this.offset;
 					}
 
@@ -301,7 +306,7 @@ public class BufferedFile {
 
 				}
 			} else {
-				if (this.fileOffset != this.offset) {
+				if (this.offset != this.fileOffset) {
 					this.accessFile.seek(this.offset);
 					this.fileOffset = this.offset;
 				}
@@ -320,15 +325,15 @@ public class BufferedFile {
 					var9 = this.readBufferOffset;
 				}
 
-				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) {
+				if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) {
 					var6 = this.offset + (long)var3;
-				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) {
+				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) {
 					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,28 +344,28 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2001872519"
+		garbageValue = "338977619"
 	)
 	@Export("flush")
 	void flush() throws IOException {
 		if (-1L != this.writeBufferOffset) {
-			if (this.writeBufferOffset != this.fileOffset) {
+			if (this.fileOffset != this.writeBufferOffset) {
 				this.accessFile.seek(this.writeBufferOffset);
 				this.fileOffset = this.writeBufferOffset;
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength);
-			this.fileOffset += (long)this.writeBufferLength * -632165000663793663L;
+			this.fileOffset += (long)this.writeBufferLength * 483175651772203009L;
 			if (this.fileOffset > this.fileLength) {
 				this.fileLength = this.fileOffset;
 			}
 
 			long var1 = -1L;
 			long var3 = -1L;
-			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) {
 				var1 = this.writeBufferOffset;
 			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) {
 				var1 = this.readBufferOffset;
@@ -368,8 +373,8 @@ public class BufferedFile {
 
 			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 (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) {
-				var3 = this.readBufferOffset + (long)this.readBufferLength;
+			} else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) {
+				var3 = (long)this.readBufferLength + this.readBufferOffset;
 			}
 
 			if (var1 > -1L && var3 > var1) {

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

@@ -1,36 +1,33 @@
+import java.applet.Applet;
 import java.io.IOException;
 import java.net.Socket;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import netscape.javascript.JSObject;
 
-@ObfuscatedName("lx")
+@ObfuscatedName("mr")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("z")
+	@ObfuscatedName("n")
+	@Export("socket")
+	Socket socket;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lgh;"
-	)
-	@Export("worldMapEvent")
-	static WorldMapEvent worldMapEvent;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Llv;"
+		descriptor = "Lmw;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("t")
-	@Export("socket")
-	Socket socket;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lle;"
+		descriptor = "Lmj;"
 	)
 	@Export("sink")
 	BufferedSink sink;
 
-	public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
+	BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
 		this.socket = var1;
 		this.socket.setSoTimeout(30000);
 		this.socket.setTcpNoDelay(true);
@@ -40,10 +37,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(S)V",
-		garbageValue = "-27454"
+		garbageValue = "4535"
 	)
 	@Export("close")
 	public void close() {
@@ -57,50 +54,50 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1311148246"
+		descriptor = "(B)I",
+		garbageValue = "61"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "88"
+		descriptor = "(I)I",
+		garbageValue = "-1430321597"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-60"
+		descriptor = "(II)Z",
+		garbageValue = "823949627"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "1814286008"
+		garbageValue = "593938417"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "([BIIB)V",
-		garbageValue = "-30"
+		garbageValue = "-4"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -111,12 +108,63 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.close();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;B)V",
-		garbageValue = "-123"
+		descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z",
+		garbageValue = "106915676"
 	)
-	public static void method5956(AbstractArchive var0) {
-		ParamComposition.ParamDefinition_archive = var0;
+	static boolean method6116(String var0, int var1, String var2) {
+		if (var1 == 0) {
+			try {
+				if (!class29.field172.startsWith("win")) {
+					throw new Exception();
+				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
+					throw new Exception();
+				} else {
+					String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
+
+					for (int var4 = 0; var4 < var0.length(); ++var4) {
+						if (var13.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 = class29.applet;
+				Object[] var5 = new Object[]{(new URL(class29.applet.getCodeBase(), var0)).toString()};
+				Object var3 = JSObject.getWindow(var7).call(var2, var5);
+				return var3 != null;
+			} catch (Throwable var9) {
+				return false;
+			}
+		} else if (var1 == 2) {
+			try {
+				class29.applet.getAppletContext().showDocument(new URL(class29.applet.getCodeBase(), var0), "_blank");
+				return true;
+			} catch (Exception var10) {
+				return false;
+			}
+		} else if (var1 == 3) {
+			try {
+				class27.method398(class29.applet, "loggedout");
+			} catch (Throwable var12) {
+			}
+
+			try {
+				class29.applet.getAppletContext().showDocument(new URL(class29.applet.getCodeBase(), var0), "_top");
+				return true;
+			} catch (Exception var11) {
+				return false;
+			}
+		} else {
+			throw new IllegalArgumentException();
+		}
 	}
 }

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

@@ -1,50 +1,45 @@
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("le")
+@ObfuscatedName("mj")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("y")
-	@Export("BZip2Decompressor_block")
-	static int[] BZip2Decompressor_block;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 815941805
+		intValue = -382364831
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 606679557
+		intValue = -1612352925
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 217020143
+		intValue = 842191613
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@Export("closed")
 	boolean closed;
 
@@ -59,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1408116923"
+		garbageValue = "1810125841"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -84,10 +79,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
-		garbageValue = "0"
+		descriptor = "([BIII)V",
+		garbageValue = "315466326"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -124,10 +119,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-811100713"
+		descriptor = "(B)V",
+		garbageValue = "25"
 	)
 	@Export("close")
 	void close() {
@@ -203,46 +198,35 @@ public class BufferedSink implements Runnable {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V",
-		garbageValue = "1118692057"
+		descriptor = "(III)I",
+		garbageValue = "148906173"
 	)
-	@Export("RunException_sendStackTrace")
-	public static void RunException_sendStackTrace(String var0, Throwable var1) {
-		if (var1 != null) {
-			var1.printStackTrace();
-		} else {
-			try {
-				String var2 = "";
-				if (var1 != null) {
-					var2 = class398.method7217(var1);
-				}
-
-				if (var0 != null) {
-					if (var1 != null) {
-						var2 = var2 + " | ";
-					}
-
-					var2 = var2 + var0;
-				}
-
-				System.out.println("Error: " + var2);
-				var2 = var2.replace(':', '.');
-				var2 = var2.replace('@', '_');
-				var2 = var2.replace('&', '_');
-				var2 = var2.replace('#', '_');
-				if (RunException.RunException_applet == null) {
-					return;
-				}
-
-				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + UserComparator6.clientType + "&e=" + var2);
-				DataInputStream var4 = new DataInputStream(var3.openStream());
-				var4.read();
-				var4.close();
-			} catch (Exception var5) {
-			}
-
+	public static int method6167(int var0, int var1) {
+		int var2;
+		if (var1 > var0) {
+			var2 = var0;
+			var0 = var1;
+			var1 = var2;
 		}
+
+		while (var1 != 0) {
+			var2 = var0 % var1;
+			var0 = var1;
+			var1 = var2;
+		}
+
+		return var0;
+	}
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)I",
+		garbageValue = "-2019684203"
+	)
+	@Export("stringCp1252NullTerminatedByteSize")
+	public static int stringCp1252NullTerminatedByteSize(String var0) {
+		return var0.length() + 1;
 	}
 }

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("lv")
+@ObfuscatedName("mw")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1632298871
+		intValue = 547360643
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1180606629
+		intValue = 61624739
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1759291227
+		intValue = 132752517
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("exception")
 	IOException exception;
 
@@ -52,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "738790028"
+		garbageValue = "743964055"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1997432496"
+		garbageValue = "-1995219880"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,10 +110,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "974096261"
+		garbageValue = "1859107666"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
@@ -133,10 +133,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "1928899713"
+		garbageValue = "-191576253"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1945764855"
+		descriptor = "(B)V",
+		garbageValue = "-54"
 	)
 	@Export("close")
 	void close() {
@@ -243,13 +243,4 @@ public class BufferedSource implements Runnable {
 			}
 		}
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1100591675"
-	)
-	public static void method5986() {
-		class41.reflectionChecks = new IterableNodeDeque();
-	}
 }

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("mn")
+@ObfuscatedName("nc")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("byteArray")
 	public byte[] byteArray;
 

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

@@ -4,44 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kp")
+@ObfuscatedName("ld")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -711959023
+		intValue = 1332805501
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 802134257
+		intValue = 1733522365
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -326255735
+		intValue = -1476651715
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("ByteArrayPool_alternativeSizes")
 	public static int[] ByteArrayPool_alternativeSizes;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@Export("ByteArrayPool_arrays")
 	public static byte[][][] ByteArrayPool_arrays;
-	@ObfuscatedName("bo")
-	static String field3775;
 
 	static {
 		ByteArrayPool_smallCount = 0;
@@ -52,10 +50,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(IZB)[B",
-		garbageValue = "55"
+		garbageValue = "36"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -92,9 +90,9 @@ public class ByteArrayPool {
 				if (ByteArrayPool_alternativeSizes[var2] != var0) {
 					if (var0 < ByteArrayPool_alternativeSizes[var2]) {
 					}
-				} else if (class127.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
-					byte[] var3 = ByteArrayPool_arrays[var2][--class127.ByteArrayPool_altSizeArrayCounts[var2]];
-					ByteArrayPool_arrays[var2][class127.ByteArrayPool_altSizeArrayCounts[var2]] = null;
+				} else if (TileItem.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
+					byte[] var3 = ByteArrayPool_arrays[var2][--TileItem.ByteArrayPool_altSizeArrayCounts[var2]];
+					ByteArrayPool_arrays[var2][TileItem.ByteArrayPool_altSizeArrayCounts[var2]] = null;
 					return var3;
 				}
 			}
@@ -102,4 +100,17 @@ public class ByteArrayPool {
 
 		return new byte[var0];
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lot;Ljava/lang/String;B)I",
+		garbageValue = "0"
+	)
+	public static int method5814(Buffer var0, String var1) {
+		int var2 = var0.offset;
+		byte[] var3 = Clock.method2797(var1);
+		var0.writeSmartByteShort(var3.length);
+		var0.offset += class264.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
+		return var0.offset - var2;
+	}
 }

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

@@ -2,18 +2,17 @@ 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("id")
+@ObfuscatedName("ja")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("DAYS_OF_THE_WEEK")
 	static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("Calendar_calendar")
 	static java.util.Calendar Calendar_calendar;
 
@@ -23,14 +22,4 @@ public class Calendar {
 		java.util.Calendar.getInstance();
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
-	)
-	static void method4863() {
-		Login.loginIndex = 24;
-		Client.setLoginResponseString("", "You were disconnected from the server.", "");
-	}
 }

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

@@ -1,35 +1,14 @@
 import java.awt.Component;
 import java.awt.Graphics;
-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("h")
+@ObfuscatedName("i")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("ss")
-	@ObfuscatedSignature(
-		descriptor = "Lai;"
-	)
-	@Export("friendSystem")
-	public static FriendSystem friendSystem;
-	@ObfuscatedName("ji")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	static Widget field77;
-	@ObfuscatedName("oh")
-	@ObfuscatedSignature(
-		descriptor = "Leo;"
-	)
-	@Export("mouseWheel")
-	static MouseWheel mouseWheel;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("component")
 	Component component;
 
@@ -37,895 +16,81 @@ public final class Canvas extends java.awt.Canvas {
 		this.component = var1;
 	}
 
-	public final void paint(Graphics var1) {
-		this.component.paint(var1);
-	}
-
 	public final void update(Graphics var1) {
 		this.component.update(var1);
 	}
 
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
-		garbageValue = "1747543750"
-	)
-	static File method125(String var0, String var1, int var2) {
-		String var3 = var2 == 0 ? "" : "" + var2;
-		JagexCache.JagexCache_locationFile = new File(class234.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat");
-		String var4 = null;
-		String var5 = null;
-		boolean var6 = false;
-		Buffer var8;
-		int var11;
-		File var27;
-		if (JagexCache.JagexCache_locationFile.exists()) {
-			try {
-				AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
-
-				int var9;
-				for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) {
-					var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset);
-					if (var9 == -1) {
-						throw new IOException();
-					}
-				}
-
-				var8.offset = 0;
-				var9 = var8.readUnsignedByte();
-				if (var9 < 1 || var9 > 3) {
-					throw new IOException("" + var9);
-				}
-
-				int var10 = 0;
-				if (var9 > 1) {
-					var10 = var8.readUnsignedByte();
-				}
-
-				if (var9 <= 2) {
-					var4 = var8.readStringCp1252NullCircumfixed();
-					if (var10 == 1) {
-						var5 = var8.readStringCp1252NullCircumfixed();
-					}
-				} else {
-					var4 = var8.readCESU8();
-					if (var10 == 1) {
-						var5 = var8.readCESU8();
-					}
-				}
-
-				var7.close();
-			} catch (IOException var25) {
-				var25.printStackTrace();
-			}
-
-			if (var4 != null) {
-				var27 = new File(var4);
-				if (!var27.exists()) {
-					var4 = null;
-				}
-			}
-
-			if (var4 != null) {
-				var27 = new File(var4, "test.dat");
-
-				boolean var28;
-				try {
-					RandomAccessFile var15 = new RandomAccessFile(var27, "rw");
-					var11 = var15.read();
-					var15.seek(0L);
-					var15.write(var11);
-					var15.seek(0L);
-					var15.close();
-					var27.delete();
-					var28 = true;
-				} catch (Exception var23) {
-					var28 = false;
-				}
-
-				if (!var28) {
-					var4 = null;
-				}
-			}
-		}
-
-		if (var4 == null && var2 == 0) {
-			label152:
-			for (int var16 = 0; var16 < DirectByteArrayCopier.cacheSubPaths.length; ++var16) {
-				for (int var17 = 0; var17 < BuddyRankComparator.cacheParentPaths.length; ++var17) {
-					File var18 = new File(BuddyRankComparator.cacheParentPaths[var17] + DirectByteArrayCopier.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar);
-					if (var18.exists()) {
-						File var19 = new File(var18, "test.dat");
-
-						boolean var29;
-						try {
-							RandomAccessFile var12 = new RandomAccessFile(var19, "rw");
-							int var13 = var12.read();
-							var12.seek(0L);
-							var12.write(var13);
-							var12.seek(0L);
-							var12.close();
-							var19.delete();
-							var29 = true;
-						} catch (Exception var22) {
-							var29 = false;
-						}
-
-						if (var29) {
-							var4 = var18.toString();
-							var6 = true;
-							break label152;
-						}
-					}
-				}
-			}
-		}
-
-		if (var4 == null) {
-			var4 = class234.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar;
-			var6 = true;
-		}
-
-		File var26;
-		if (var5 != null) {
-			var26 = new File(var5);
-			var27 = new File(var4);
-
-			try {
-				File[] var33 = var26.listFiles();
-				File[] var31 = var33;
-
-				for (var11 = 0; var11 < var31.length; ++var11) {
-					File var30 = var31[var11];
-					File var20 = new File(var27, var30.getName());
-					boolean var14 = var30.renameTo(var20);
-					if (!var14) {
-						throw new IOException();
-					}
-				}
-			} catch (Exception var24) {
-				var24.printStackTrace();
-			}
-
-			var6 = true;
-		}
-
-		if (var6) {
-			var26 = new File(var4);
-			var8 = null;
-
-			try {
-				AccessFile var34 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
-				Buffer var32 = new Buffer(500);
-				var32.writeByte(3);
-				var32.writeByte(var8 != null ? 1 : 0);
-				var32.writeCESU8(var26.getPath());
-				if (var8 != null) {
-					var32.writeCESU8("");
-				}
-
-				var34.write(var32.array, 0, var32.offset);
-				var34.close();
-			} catch (IOException var21) {
-				var21.printStackTrace();
-			}
-		}
-
-		return new File(var4);
+	public final void paint(Graphics var1) {
+		this.component.paint(var1);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-905018631"
+	)
+	public static void method371() {
+		class135.midiPcmStream.clear();
+		class247.musicPlayerStatus = 1;
+		class247.musicTrackArchive = null;
+	}
+
+	@ObfuscatedName("hl")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "54"
+		garbageValue = "77"
 	)
-	public static void method123() {
-		Widget.Widget_cachedSprites.clear();
-		Widget.Widget_cachedModels.clear();
-		Widget.Widget_cachedFonts.clear();
-		Widget.Widget_cachedSpriteMasks.clear();
+	@Export("addCancelMenuEntry")
+	static void addCancelMenuEntry() {
+		Client.menuOptionsCount = 0;
+		Client.isMenuOpen = false;
+		Client.menuActions[0] = "Cancel";
+		Client.menuTargets[0] = "";
+		Client.menuOpcodes[0] = 1006;
+		Client.menuShiftClick[0] = false;
+		Client.menuOptionsCount = 1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("jg")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIILgw;Lfy;I)V",
-		garbageValue = "1213959162"
+		descriptor = "(Ljd;III)V",
+		garbageValue = "-682005079"
 	)
-	static final void method120(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
-		ObjectComposition var9 = ClanChannel.getObjectDefinition(var4);
-		int var10;
-		int var11;
-		if (var5 != 1 && var5 != 3) {
-			var10 = var9.sizeX;
-			var11 = var9.sizeY;
-		} else {
-			var10 = var9.sizeY;
-			var11 = var9.sizeX;
-		}
-
-		int var12;
-		int var13;
-		if (var10 + var2 <= 104) {
-			var12 = (var10 >> 1) + var2;
-			var13 = var2 + (var10 + 1 >> 1);
-		} else {
-			var12 = var2;
-			var13 = var2 + 1;
-		}
-
-		int var14;
-		int var15;
-		if (var3 + var11 <= 104) {
-			var14 = var3 + (var11 >> 1);
-			var15 = var3 + (var11 + 1 >> 1);
-		} else {
-			var14 = var3;
-			var15 = var3 + 1;
-		}
-
-		int[][] var16 = Tiles.Tiles_heights[var1];
-		int var17 = var16[var13][var15] + var16[var12][var14] + var16[var13][var14] + var16[var12][var15] >> 2;
-		int var18 = (var2 << 7) + (var10 << 6);
-		int var19 = (var3 << 7) + (var11 << 6);
-		long var20 = class171.calculateTag(var2, var3, 2, var9.int1 == 0, var4);
-		int var22 = (var5 << 6) + var6;
-		if (var9.int3 == 1) {
-			var22 += 256;
-		}
-
-		Object var30;
-		if (var6 == 22) {
-			if (var9.animationId == -1 && var9.transforms == null) {
-				var30 = var9.getModel(22, var5, var16, var18, var17, var19);
-			} else {
-				var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-			}
-
-			var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22);
-			if (var9.interactType == 1) {
-				var8.setBlockedByFloorDec(var2, var3);
-			}
-
-		} else if (var6 != 10 && var6 != 11) {
-			if (var6 >= 12) {
-				if (var9.animationId == -1 && var9.transforms == null) {
-					var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
-				} else {
-					var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
+	@Export("clickWidget")
+	static final void clickWidget(Widget var0, int var1, int var2) {
+		if (Client.clickedWidget == null && !Client.isMenuOpen) {
+			if (var0 != null) {
+				Widget var4 = Message.method1099(var0);
+				if (var4 == null) {
+					var4 = var0.parent;
 				}
 
-				var7.method3984(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22);
-				if (var9.interactType != 0) {
-					var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
-				}
-
-			} else if (var6 == 0) {
-				if (var9.animationId == -1 && var9.transforms == null) {
-					var30 = var9.getModel(0, var5, var16, var18, var17, var19);
-				} else {
-					var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-				}
-
-				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field907[var5], 0, var20, var22);
-				if (var9.interactType != 0) {
-					var8.method3171(var2, var3, var6, var5, var9.boolean1);
-				}
-
-			} else if (var6 == 1) {
-				if (var9.animationId == -1 && var9.transforms == null) {
-					var30 = var9.getModel(1, var5, var16, var18, var17, var19);
-				} else {
-					var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-				}
-
-				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field908[var5], 0, var20, var22);
-				if (var9.interactType != 0) {
-					var8.method3171(var2, var3, var6, var5, var9.boolean1);
-				}
-
-			} else {
-				int var23;
-				if (var6 == 2) {
-					var23 = var5 + 1 & 3;
-					Object var25;
-					Object var31;
-					if (var9.animationId == -1 && var9.transforms == null) {
-						var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19);
-						var25 = var9.getModel(2, var23, var16, var18, var17, var19);
-					} else {
-						var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-						var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
+				if (var4 != null) {
+					Client.clickedWidget = var0;
+					var4 = Message.method1099(var0);
+					if (var4 == null) {
+						var4 = var0.parent;
 					}
 
-					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field907[var5], Tiles.field907[var23], var20, var22);
-					if (var9.interactType != 0) {
-						var8.method3171(var2, var3, var6, var5, var9.boolean1);
+					Client.clickedWidgetParent = var4;
+					Client.widgetClickX = var1;
+					Client.widgetClickY = var2;
+					class125.widgetDragDuration = 0;
+					Client.isDraggingWidget = false;
+					int var5 = class28.method410();
+					if (var5 != -1) {
+						ArchiveDiskAction.tempMenuAction = new MenuAction();
+						ArchiveDiskAction.tempMenuAction.param0 = Client.menuArguments1[var5];
+						ArchiveDiskAction.tempMenuAction.param1 = Client.menuArguments2[var5];
+						ArchiveDiskAction.tempMenuAction.opcode = Client.menuOpcodes[var5];
+						ArchiveDiskAction.tempMenuAction.identifier = Client.menuIdentifiers[var5];
+						ArchiveDiskAction.tempMenuAction.action = Client.menuActions[var5];
 					}
 
-				} else if (var6 == 3) {
-					if (var9.animationId == -1 && var9.transforms == null) {
-						var30 = var9.getModel(3, var5, var16, var18, var17, var19);
-					} else {
-						var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-					}
-
-					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field908[var5], 0, var20, var22);
-					if (var9.interactType != 0) {
-						var8.method3171(var2, var3, var6, var5, var9.boolean1);
-					}
-
-				} else if (var6 == 9) {
-					if (var9.animationId == -1 && var9.transforms == null) {
-						var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
-					} else {
-						var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-					}
-
-					var7.method3984(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22);
-					if (var9.interactType != 0) {
-						var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
-					}
-
-				} else if (var6 == 4) {
-					if (var9.animationId == -1 && var9.transforms == null) {
-						var30 = var9.getModel(4, var5, var16, var18, var17, var19);
-					} else {
-						var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-					}
-
-					var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field907[var5], 0, 0, 0, var20, var22);
-				} else {
-					long var24;
-					Object var26;
-					if (var6 == 5) {
-						var23 = 16;
-						var24 = var7.getBoundaryObjectTag(var0, var2, var3);
-						if (0L != var24) {
-							var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2;
-						}
-
-						if (var9.animationId == -1 && var9.transforms == null) {
-							var26 = var9.getModel(4, var5, var16, var18, var17, var19);
-						} else {
-							var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field907[var5], 0, var23 * Tiles.field905[var5], var23 * Tiles.field912[var5], var20, var22);
-					} else if (var6 == 6) {
-						var23 = 8;
-						var24 = var7.getBoundaryObjectTag(var0, var2, var3);
-						if (0L != var24) {
-							var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2 / 2;
-						}
-
-						if (var9.animationId == -1 && var9.transforms == null) {
-							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
-						} else {
-							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field903[var5], var23 * Tiles.field914[var5], var20, var22);
-					} else if (var6 == 7) {
-						int var29 = var5 + 2 & 3;
-						if (var9.animationId == -1 && var9.transforms == null) {
-							var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
-						} else {
-							var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22);
-					} else if (var6 == 8) {
-						var23 = 8;
-						var24 = var7.getBoundaryObjectTag(var0, var2, var3);
-						if (var24 != 0L) {
-							var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2 / 2;
-						}
-
-						int var28 = var5 + 2 & 3;
-						Object var27;
-						if (var9.animationId == -1 && var9.transforms == null) {
-							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
-							var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19);
-						} else {
-							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-							var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field903[var5], var23 * Tiles.field914[var5], var20, var22);
-					}
-				}
-			}
-		} else {
-			if (var9.animationId == -1 && var9.transforms == null) {
-				var30 = var9.getModel(10, var5, var16, var18, var17, var19);
-			} else {
-				var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null);
-			}
-
-			if (var30 != null) {
-				var7.method3984(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
-			}
-
-			if (var9.interactType != 0) {
-				var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
-			}
-
-		}
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "1283945843"
-	)
-	static int method124(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] = WallDecoration.method4340(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] = UserComparator3.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] = WorldMapDecorationType.method4888(var3, var4);
-				return 1;
-			} else if (var0 == ScriptOpcodes.INV_SIZE) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class100.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 = GrandExchangeEvent.Client_plane;
-					var4 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX;
-					var5 = (MouseHandler.localPlayer.y >> 7) + NPC.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] = WallDecoration.method4340(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] = UserComparator3.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] = WorldMapDecorationType.method4888(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 if (var0 == 3326) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field417;
-					return 1;
-				} else if (var0 == 3327) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field418;
-					return 1;
-				} else {
-					return 2;
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		descriptor = "(Laq;S)V",
-		garbageValue = "-8915"
-	)
-	@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);
-		}
-
-	}
-
-	@ObfuscatedName("hc")
-	@ObfuscatedSignature(
-		descriptor = "(Lhv;B)V",
-		garbageValue = "19"
-	)
-	static final void method114(class227 var0) {
-		PacketBuffer var1 = Client.packetWriter.packetBuffer;
-		byte var3;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		int var11;
-		int var12;
-		int var13;
-		int var14;
-		int var37;
-		int var38;
-		int var39;
-		if (class227.field2675 == var0) {
-			var37 = var1.readUnsignedByte();
-			var3 = var1.method6644();
-			var39 = var1.method6785();
-			var5 = var1.method6696();
-			byte var40 = var1.readByte();
-			var7 = var1.method6686();
-			var8 = (var7 >> 4 & 7) + Language.field3694;
-			var9 = (var7 & 7) + SecureRandomFuture.field858;
-			var10 = var1.method6688() * 4;
-			var11 = var1.method6686() * 4;
-			var12 = var1.method6698();
-			var13 = var1.method6873();
-			var14 = var1.readUnsignedShort();
-			var38 = var3 + var8;
-			var6 = var40 + var9;
-			if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104 && var5 != 65535) {
-				var8 = var8 * 128 + 64;
-				var9 = var9 * 128 + 64;
-				var38 = var38 * 128 + 64;
-				var6 = var6 * 128 + 64;
-				Projectile var36 = new Projectile(var5, GrandExchangeEvent.Client_plane, var8, var9, class122.getTileHeight(var8, var9, GrandExchangeEvent.Client_plane) - var11, var14 + Client.cycle, var39 + Client.cycle, var37, var13, var12, var10);
-				var36.setDestination(var38, var6, class122.getTileHeight(var38, var6, GrandExchangeEvent.Client_plane) - var10, var14 + Client.cycle);
-				Client.projectiles.addFirst(var36);
-			}
-
-		} else {
-			if (class227.field2676 == var0) {
-				byte var2 = var1.method6690();
-				var3 = var1.method6690();
-				byte var4 = var1.method6689();
-				var5 = var1.method6696();
-				var6 = var1.readUnsignedShort();
-				var7 = var1.method6697();
-				var8 = var1.method6873();
-				var9 = var8 >> 2;
-				var10 = var8 & 3;
-				var11 = Client.field467[var9];
-				var12 = var1.method6686();
-				var13 = (var12 >> 4 & 7) + Language.field3694;
-				var14 = (var12 & 7) + SecureRandomFuture.field858;
-				byte var15 = var1.method6689();
-				int var16 = var1.method6696();
-				Player var17;
-				if (var7 == Client.localPlayerIndex) {
-					var17 = MouseHandler.localPlayer;
-				} else {
-					var17 = Client.players[var7];
-				}
-
-				if (var17 != null) {
-					ObjectComposition var18 = ClanChannel.getObjectDefinition(var6);
-					int var19;
-					int var20;
-					if (var10 != 1 && var10 != 3) {
-						var19 = var18.sizeX;
-						var20 = var18.sizeY;
-					} else {
-						var19 = var18.sizeY;
-						var20 = var18.sizeX;
-					}
-
-					int var21 = var13 + (var19 >> 1);
-					int var22 = var13 + (var19 + 1 >> 1);
-					int var23 = var14 + (var20 >> 1);
-					int var24 = var14 + (var20 + 1 >> 1);
-					int[][] var25 = Tiles.Tiles_heights[GrandExchangeEvent.Client_plane];
-					int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2;
-					int var27 = (var13 << 7) + (var19 << 6);
-					int var28 = (var14 << 7) + (var20 << 6);
-					Model var29 = var18.getModel(var9, var10, var25, var27, var26, var28);
-					if (var29 != null) {
-						ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var13, var14, var11, -1, 0, 0, var16 + 1, var5 + 1);
-						var17.animationCycleStart = var16 + Client.cycle;
-						var17.animationCycleEnd = var5 + Client.cycle;
-						var17.model0 = var29;
-						var17.field982 = var19 * 64 + var13 * 128;
-						var17.field989 = var20 * 64 + var14 * 128;
-						var17.tileHeight2 = var26;
-						byte var30;
-						if (var2 > var15) {
-							var30 = var2;
-							var2 = var15;
-							var15 = var30;
-						}
-
-						if (var4 > var3) {
-							var30 = var4;
-							var4 = var3;
-							var3 = var30;
-						}
-
-						var17.minX = var13 + var2;
-						var17.maxX = var15 + var13;
-						var17.minY = var4 + var14;
-						var17.maxY = var14 + var3;
-					}
+					return;
 				}
 			}
 
-			if (class227.field2682 == var0) {
-				var37 = var1.method6686();
-				var38 = (var37 >> 4 & 7) + Language.field3694;
-				var39 = (var37 & 7) + SecureRandomFuture.field858;
-				var5 = var1.method6688();
-				var6 = var1.method6697();
-				var7 = var1.method6697();
-				if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
-					var38 = var38 * 128 + 64;
-					var39 = var39 * 128 + 64;
-					GraphicsObject var44 = new GraphicsObject(var7, GrandExchangeEvent.Client_plane, var38, var39, class122.getTileHeight(var38, var39, GrandExchangeEvent.Client_plane) - var5, var6, Client.cycle);
-					Client.graphicsObjects.addFirst(var44);
-				}
-
-			} else if (class227.field2683 == var0) {
-				var37 = var1.method6697();
-				var38 = var1.method6688();
-				var39 = (var38 >> 4 & 7) + Language.field3694;
-				var5 = (var38 & 7) + SecureRandomFuture.field858;
-				var6 = var1.method6785();
-				var7 = var1.readUnsignedShort();
-				if (var39 >= 0 && var5 >= 0 && var39 < 104 && var5 < 104) {
-					NodeDeque var34 = Client.groundItems[GrandExchangeEvent.Client_plane][var39][var5];
-					if (var34 != null) {
-						for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) {
-							if ((var6 & 32767) == var35.id && var7 == var35.quantity) {
-								var35.quantity = var37;
-								break;
-							}
-						}
-
-						FriendSystem.updateItemPile(var39, var5);
-					}
-				}
-
-			} else {
-				TileItem var32;
-				if (class227.field2680 == var0) {
-					var37 = var1.method6873();
-					var38 = (var37 >> 4 & 7) + Language.field3694;
-					var39 = (var37 & 7) + SecureRandomFuture.field858;
-					var5 = var1.method6696();
-					if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
-						NodeDeque var33 = Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39];
-						if (var33 != null) {
-							for (var32 = (TileItem)var33.last(); var32 != null; var32 = (TileItem)var33.previous()) {
-								if ((var5 & 32767) == var32.id) {
-									var32.remove();
-									break;
-								}
-							}
-
-							if (var33.last() == null) {
-								Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] = null;
-							}
-
-							FriendSystem.updateItemPile(var38, var39);
-						}
-					}
-
-				} else if (class227.field2678 == var0) {
-					var37 = var1.readUnsignedByte();
-					var38 = (var37 >> 4 & 7) + Language.field3694;
-					var39 = (var37 & 7) + SecureRandomFuture.field858;
-					var5 = var1.method6873();
-					var6 = var5 >> 2;
-					var7 = var5 & 3;
-					var8 = Client.field467[var6];
-					if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
-						ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var38, var39, var8, -1, var6, var7, 0, -1);
-					}
-
-				} else {
-					if (class227.field2681 == var0) {
-						var37 = var1.readUnsignedShort();
-						var38 = var1.method6873();
-						var39 = (var38 >> 4 & 7) + Language.field3694;
-						var5 = (var38 & 7) + SecureRandomFuture.field858;
-						var6 = var1.readUnsignedByte();
-						var7 = var6 >> 4 & 15;
-						var8 = var6 & 7;
-						var9 = var1.method6873();
-						if (var39 >= 0 && var5 >= 0 && var39 < 104 && var5 < 104) {
-							var10 = var7 + 1;
-							if (MouseHandler.localPlayer.pathX[0] >= var39 - var10 && MouseHandler.localPlayer.pathX[0] <= var39 + var10 && MouseHandler.localPlayer.pathY[0] >= var5 - var10 && MouseHandler.localPlayer.pathY[0] <= var5 + var10 && Decimator.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) {
-								Client.soundEffectIds[Client.soundEffectCount] = var37;
-								Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8;
-								Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9;
-								Client.soundEffects[Client.soundEffectCount] = null;
-								Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var39 << 16);
-								++Client.soundEffectCount;
-							}
-						}
-					}
-
-					if (class227.field2674 == var0) {
-						var37 = var1.method6873();
-						var38 = (var37 >> 4 & 7) + Language.field3694;
-						var39 = (var37 & 7) + SecureRandomFuture.field858;
-						var5 = var1.method6785();
-						var6 = var1.method6785();
-						if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
-							var32 = new TileItem();
-							var32.id = var5;
-							var32.quantity = var6;
-							if (Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] == null) {
-								Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] = new NodeDeque();
-							}
-
-							Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39].addFirst(var32);
-							FriendSystem.updateItemPile(var38, var39);
-						}
-
-					} else if (class227.field2677 != var0) {
-						if (class227.field2679 == var0) {
-							var37 = var1.method6873();
-							var38 = var37 >> 2;
-							var39 = var37 & 3;
-							var5 = Client.field467[var38];
-							var6 = var1.readUnsignedByte();
-							var7 = (var6 >> 4 & 7) + Language.field3694;
-							var8 = (var6 & 7) + SecureRandomFuture.field858;
-							var9 = var1.readUnsignedShort();
-							if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
-								ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var7, var8, var5, var9, var38, var39, 0, -1);
-							}
-
-						}
-					} else {
-						var37 = var1.method6686();
-						var38 = (var37 >> 4 & 7) + Language.field3694;
-						var39 = (var37 & 7) + SecureRandomFuture.field858;
-						var5 = var1.method6697();
-						var6 = var1.method6688();
-						var7 = var6 >> 2;
-						var8 = var6 & 3;
-						var9 = Client.field467[var7];
-						if (var38 >= 0 && var39 >= 0 && var38 < 103 && var39 < 103) {
-							if (var9 == 0) {
-								BoundaryObject var31 = WorldMapIcon_1.scene.method4060(GrandExchangeEvent.Client_plane, var38, var39);
-								if (var31 != null) {
-									var11 = class78.Entity_unpackID(var31.tag);
-									if (var7 == 2) {
-										var31.renderable1 = new DynamicObject(var11, 2, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable1);
-										var31.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable2);
-									} else {
-										var31.renderable1 = new DynamicObject(var11, var7, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable1);
-									}
-								}
-							}
-
-							if (var9 == 1) {
-								WallDecoration var41 = WorldMapIcon_1.scene.method3997(GrandExchangeEvent.Client_plane, var38, var39);
-								if (var41 != null) {
-									var11 = class78.Entity_unpackID(var41.tag);
-									if (var7 != 4 && var7 != 5) {
-										if (var7 == 6) {
-											var41.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1);
-										} else if (var7 == 7) {
-											var41.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1);
-										} else if (var7 == 8) {
-											var41.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1);
-											var41.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable2);
-										}
-									} else {
-										var41.renderable1 = new DynamicObject(var11, 4, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1);
-									}
-								}
-							}
-
-							if (var9 == 2) {
-								GameObject var42 = WorldMapIcon_1.scene.method4043(GrandExchangeEvent.Client_plane, var38, var39);
-								if (var7 == 11) {
-									var7 = 10;
-								}
-
-								if (var42 != null) {
-									var42.renderable = new DynamicObject(class78.Entity_unpackID(var42.tag), var7, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var42.renderable);
-								}
-							}
-
-							if (var9 == 3) {
-								FloorDecoration var43 = WorldMapIcon_1.scene.getFloorDecoration(GrandExchangeEvent.Client_plane, var38, var39);
-								if (var43 != null) {
-									var43.renderable = new DynamicObject(class78.Entity_unpackID(var43.tag), 22, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var43.renderable);
-								}
-							}
-						}
-
-					}
-				}
-			}
 		}
 	}
 }

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

@@ -4,26 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bw")
+@ObfuscatedName("bv")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("l")
-	static byte[][][] field894;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("q")
+	@Export("cacheSubPaths")
+	public static String[] cacheSubPaths;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "[Lof;"
-	)
-	@Export("worldSelectStars")
-	static IndexedSprite[] worldSelectStars;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "[Lay;"
+		descriptor = "[Lbc;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1725833491
+		intValue = 1943086625
 	)
 	@Export("count")
 	int count;
@@ -32,10 +27,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lay;",
-		garbageValue = "-167767971"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbc;",
+		garbageValue = "-108"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -63,51 +58,71 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lay;",
-		garbageValue = "-1045068186"
+		descriptor = "(II)Lbc;",
+		garbageValue = "-2139303618"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-199377669"
+		garbageValue = "2102896661"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;Ljava/lang/String;Ljava/lang/String;B)[Lom;",
-		garbageValue = "-4"
+		descriptor = "(Lbh;Lbh;IZI)I",
+		garbageValue = "505679826"
 	)
-	public static SpritePixels[] method1735(AbstractArchive var0, String var1, String var2) {
-		int var3 = var0.getGroupId(var1);
-		int var4 = var0.getFileId(var3, var2);
-		return Actor.method1884(var0, var3, var4);
-	}
+	@Export("compareWorlds")
+	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;
+				}
 
-	@ObfuscatedName("fl")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1407101410"
-	)
-	static final void method1734() {
-		if (UserComparator8.ClanChat_inClanChat) {
-			if (MouseRecorder.friendsChat != null) {
-				MouseRecorder.friendsChat.sort();
+				if (var5 == -1) {
+					var5 = 2001;
+				}
 			}
 
-			ParamComposition.method2911();
-			UserComparator8.ClanChat_inClanChat = false;
+			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.method1619() ? (var1.method1619() ? 0 : 1) : (var1.method1619() ? -1 : 0);
+		} else if (var2 == 5) {
+			return var0.method1614() ? (var1.method1614() ? 0 : 1) : (var1.method1614() ? -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;
 		}
-
 	}
 }

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

@@ -7,61 +7,49 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dt")
+@ObfuscatedName("eb")
 @Implements("ClanChannel")
 public class ClanChannel extends Node {
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -360591133
-	)
-	@Export("pcmSampleLength")
-	public static int pcmSampleLength;
-	@ObfuscatedName("dz")
-	@ObfuscatedSignature(
-		descriptor = "Ljs;"
-	)
-	@Export("archive13")
-	static Archive archive13;
-	@ObfuscatedName("s")
-	boolean field1431;
-	@ObfuscatedName("t")
-	boolean field1434;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
+	boolean field1519;
+	@ObfuscatedName("c")
+	boolean field1512;
+	@ObfuscatedName("m")
 	@Export("members")
 	public List members;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = 7823946021418061389L
+		longValue = -3790733818570190469L
 	)
-	long field1433;
-	@ObfuscatedName("n")
+	long field1516;
+	@ObfuscatedName("g")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("w")
-	public byte field1430;
-	@ObfuscatedName("f")
-	public byte field1436;
+	@ObfuscatedName("z")
+	public byte field1518;
+	@ObfuscatedName("a")
+	public byte field1513;
 
 	static {
 		new BitSet(65536);
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;)V"
+		descriptor = "(Lot;)V"
 	)
 	public ClanChannel(Buffer var1) {
-		this.field1434 = true;
+		this.field1512 = true;
 		this.name = null;
-		this.method2514(var1);
+		this.method2680(var1);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)[I",
-		garbageValue = "5"
+		descriptor = "(I)[I",
+		garbageValue = "-2070605103"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
@@ -70,19 +58,19 @@ public class ClanChannel extends Node {
 			this.sortedMembers = new int[this.members.size()];
 
 			for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) {
-				var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7241();
+				var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7399();
 			}
 
-			class282.method5133(var1, this.sortedMembers);
+			MouseHandler.method580(var1, this.sortedMembers);
 		}
 
 		return this.sortedMembers;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ldf;I)V",
-		garbageValue = "1690415442"
+		descriptor = "(Ldr;I)V",
+		garbageValue = "1841973558"
 	)
 	@Export("addMember")
 	void addMember(ClanChannelMember var1) {
@@ -90,10 +78,10 @@ public class ClanChannel extends Node {
 		this.sortedMembers = null;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1192263820"
+		descriptor = "(IB)V",
+		garbageValue = "32"
 	)
 	@Export("removeMember")
 	void removeMember(int var1) {
@@ -101,22 +89,22 @@ public class ClanChannel extends Node {
 		this.sortedMembers = null;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-338635200"
+		garbageValue = "-1608284005"
 	)
-	public int method2520() {
+	public int method2677() {
 		return this.members.size();
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-2011364190"
+		garbageValue = "-1547168983"
 	)
-	public int method2512(String var1) {
-		if (!this.field1434) {
+	public int method2674(String var1) {
+		if (!this.field1512) {
 			throw new RuntimeException("Displaynames not available");
 		} else {
 			for (int var2 = 0; var2 < this.members.size(); ++var2) {
@@ -129,19 +117,19 @@ public class ClanChannel extends Node {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;I)V",
-		garbageValue = "-1321038089"
+		descriptor = "(Lot;I)V",
+		garbageValue = "-802719408"
 	)
-	void method2514(Buffer var1) {
+	void method2680(Buffer var1) {
 		int var2 = var1.readUnsignedByte();
 		if ((var2 & 1) != 0) {
-			this.field1431 = true;
+			this.field1519 = true;
 		}
 
 		if ((var2 & 2) != 0) {
-			this.field1434 = true;
+			this.field1512 = true;
 		}
 
 		int var3 = 2;
@@ -150,22 +138,22 @@ public class ClanChannel extends Node {
 		}
 
 		super.key = var1.readLong();
-		this.field1433 = var1.readLong();
+		this.field1516 = var1.readLong();
 		this.name = var1.readStringCp1252NullTerminated();
 		var1.readBoolean();
-		this.field1436 = var1.readByte();
-		this.field1430 = var1.readByte();
+		this.field1513 = var1.readByte();
+		this.field1518 = var1.readByte();
 		int var4 = var1.readUnsignedShort();
 		if (var4 > 0) {
 			this.members = new ArrayList(var4);
 
 			for (int var5 = 0; var5 < var4; ++var5) {
 				ClanChannelMember var6 = new ClanChannelMember();
-				if (this.field1431) {
+				if (this.field1519) {
 					var1.readLong();
 				}
 
-				if (this.field1434) {
+				if (this.field1512) {
 					var6.username = new Username(var1.readStringCp1252NullTerminated());
 				}
 
@@ -180,394 +168,4 @@ public class ClanChannel extends Node {
 		}
 
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(IIILfg;Lfy;Z[I[IB)I",
-		garbageValue = "-18"
-	)
-	public static int method2508(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) {
-		int var9;
-		for (int var8 = 0; var8 < 128; ++var8) {
-			for (var9 = 0; var9 < 128; ++var9) {
-				class161.directions[var8][var9] = 0;
-				class161.distances[var8][var9] = 99999999;
-			}
-		}
-
-		int var10;
-		int var11;
-		byte var13;
-		int var14;
-		int var15;
-		int var17;
-		int var19;
-		int var20;
-		int var21;
-		int var22;
-		boolean var28;
-		int var30;
-		int var31;
-		int var33;
-		if (var2 == 1) {
-			var28 = VarpDefinition.method2715(var0, var1, var3, var4);
-		} else if (var2 == 2) {
-			var28 = KeyHandler.method107(var0, var1, var3, var4);
-		} else {
-			var10 = var0;
-			var11 = var1;
-			byte var12 = 64;
-			var13 = 64;
-			var14 = var0 - var12;
-			var15 = var1 - var13;
-			class161.directions[var12][var13] = 99;
-			class161.distances[var12][var13] = 0;
-			byte var16 = 0;
-			var17 = 0;
-			class161.bufferX[var16] = var0;
-			var33 = var16 + 1;
-			class161.bufferY[var16] = var1;
-			int[][] var18 = var4.flags;
-
-			boolean var29;
-			label457:
-			while (true) {
-				label455:
-				while (true) {
-					do {
-						do {
-							do {
-								label432:
-								do {
-									if (var33 == var17) {
-										SoundSystem.field219 = var10;
-										class161.field1896 = var11;
-										var29 = false;
-										break label457;
-									}
-
-									var10 = class161.bufferX[var17];
-									var11 = class161.bufferY[var17];
-									var17 = var17 + 1 & 4095;
-									var30 = var10 - var14;
-									var31 = var11 - var15;
-									var19 = var10 - var4.xInset;
-									var20 = var11 - var4.yInset;
-									if (var3.hasArrived(var2, var10, var11, var4)) {
-										SoundSystem.field219 = var10;
-										class161.field1896 = var11;
-										var29 = true;
-										break label457;
-									}
-
-									var21 = class161.distances[var30][var31] + 1;
-									if (var30 > 0 && class161.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + var2 - 1] & 19136824) == 0) {
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class161.bufferX[var33] = var10 - 1;
-												class161.bufferY[var33] = var11;
-												var33 = var33 + 1 & 4095;
-												class161.directions[var30 - 1][var31] = 2;
-												class161.distances[var30 - 1][var31] = var21;
-												break;
-											}
-
-											if ((var18[var19 - 1][var20 + var22] & 19136830) != 0) {
-												break;
-											}
-
-											++var22;
-										}
-									}
-
-									if (var30 < 128 - var2 && class161.directions[var30 + 1][var31] == 0 && (var18[var19 + var2][var20] & 19136899) == 0 && (var18[var19 + var2][var20 + var2 - 1] & 19136992) == 0) {
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class161.bufferX[var33] = var10 + 1;
-												class161.bufferY[var33] = var11;
-												var33 = var33 + 1 & 4095;
-												class161.directions[var30 + 1][var31] = 8;
-												class161.distances[var30 + 1][var31] = var21;
-												break;
-											}
-
-											if ((var18[var19 + var2][var20 + var22] & 19136995) != 0) {
-												break;
-											}
-
-											++var22;
-										}
-									}
-
-									if (var31 > 0 && class161.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + var2 - 1][var20 - 1] & 19136899) == 0) {
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class161.bufferX[var33] = var10;
-												class161.bufferY[var33] = var11 - 1;
-												var33 = var33 + 1 & 4095;
-												class161.directions[var30][var31 - 1] = 1;
-												class161.distances[var30][var31 - 1] = var21;
-												break;
-											}
-
-											if ((var18[var22 + var19][var20 - 1] & 19136911) != 0) {
-												break;
-											}
-
-											++var22;
-										}
-									}
-
-									if (var31 < 128 - var2 && class161.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + var2] & 19136824) == 0 && (var18[var19 + var2 - 1][var20 + var2] & 19136992) == 0) {
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class161.bufferX[var33] = var10;
-												class161.bufferY[var33] = var11 + 1;
-												var33 = var33 + 1 & 4095;
-												class161.directions[var30][var31 + 1] = 4;
-												class161.distances[var30][var31 + 1] = var21;
-												break;
-											}
-
-											if ((var18[var19 + var22][var20 + var2] & 19137016) != 0) {
-												break;
-											}
-
-											++var22;
-										}
-									}
-
-									if (var30 > 0 && var31 > 0 && class161.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0) {
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2) {
-												class161.bufferX[var33] = var10 - 1;
-												class161.bufferY[var33] = var11 - 1;
-												var33 = var33 + 1 & 4095;
-												class161.directions[var30 - 1][var31 - 1] = 3;
-												class161.distances[var30 - 1][var31 - 1] = var21;
-												break;
-											}
-
-											if ((var18[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) {
-												break;
-											}
-
-											++var22;
-										}
-									}
-
-									if (var30 < 128 - var2 && var31 > 0 && class161.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + var2][var20 - 1] & 19136899) == 0) {
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2) {
-												class161.bufferX[var33] = var10 + 1;
-												class161.bufferY[var33] = var11 - 1;
-												var33 = var33 + 1 & 4095;
-												class161.directions[var30 + 1][var31 - 1] = 9;
-												class161.distances[var30 + 1][var31 - 1] = var21;
-												break;
-											}
-
-											if ((var18[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var18[var19 + var22][var20 - 1] & 19136911) != 0) {
-												break;
-											}
-
-											++var22;
-										}
-									}
-
-									if (var30 > 0 && var31 < 128 - var2 && class161.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + var2] & 19136824) == 0) {
-										for (var22 = 1; var22 < var2; ++var22) {
-											if ((var18[var19 - 1][var22 + var20] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) {
-												continue label432;
-											}
-										}
-
-										class161.bufferX[var33] = var10 - 1;
-										class161.bufferY[var33] = var11 + 1;
-										var33 = var33 + 1 & 4095;
-										class161.directions[var30 - 1][var31 + 1] = 6;
-										class161.distances[var30 - 1][var31 + 1] = var21;
-									}
-								} while(var30 >= 128 - var2);
-							} while(var31 >= 128 - var2);
-						} while(class161.directions[var30 + 1][var31 + 1] != 0);
-					} while((var18[var19 + var2][var20 + var2] & 19136992) != 0);
-
-					for (var22 = 1; var22 < var2; ++var22) {
-						if ((var18[var22 + var19][var20 + var2] & 19137016) != 0 || (var18[var19 + var2][var20 + var22] & 19136995) != 0) {
-							continue label455;
-						}
-					}
-
-					class161.bufferX[var33] = var10 + 1;
-					class161.bufferY[var33] = var11 + 1;
-					var33 = var33 + 1 & 4095;
-					class161.directions[var30 + 1][var31 + 1] = 12;
-					class161.distances[var30 + 1][var31 + 1] = var21;
-				}
-			}
-
-			var28 = var29;
-		}
-
-		var9 = var0 - 64;
-		var10 = var1 - 64;
-		var11 = SoundSystem.field219;
-		var30 = class161.field1896;
-		if (!var28) {
-			var31 = Integer.MAX_VALUE;
-			var14 = Integer.MAX_VALUE;
-			byte var32 = 10;
-			var33 = var3.approxDestinationX;
-			var17 = var3.approxDestinationY;
-			int var27 = var3.approxDestinationSizeX;
-			var19 = var3.approxDestinationSizeY;
-
-			for (var20 = var33 - var32; var20 <= var32 + var33; ++var20) {
-				for (var21 = var17 - var32; var21 <= var17 + var32; ++var21) {
-					var22 = var20 - var9;
-					int var23 = var21 - var10;
-					if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class161.distances[var22][var23] < 100) {
-						int var24 = 0;
-						if (var20 < var33) {
-							var24 = var33 - var20;
-						} else if (var20 > var27 + var33 - 1) {
-							var24 = var20 - (var27 + var33 - 1);
-						}
-
-						int var25 = 0;
-						if (var21 < var17) {
-							var25 = var17 - var21;
-						} else if (var21 > var17 + var19 - 1) {
-							var25 = var21 - (var19 + var17 - 1);
-						}
-
-						int var26 = var25 * var25 + var24 * var24;
-						if (var26 < var31 || var26 == var31 && class161.distances[var22][var23] < var14) {
-							var31 = var26;
-							var14 = class161.distances[var22][var23];
-							var11 = var20;
-							var30 = var21;
-						}
-					}
-				}
-			}
-
-			if (var31 == Integer.MAX_VALUE) {
-				return -1;
-			}
-		}
-
-		if (var0 == var11 && var30 == var1) {
-			return 0;
-		} else {
-			var13 = 0;
-			class161.bufferX[var13] = var11;
-			var31 = var13 + 1;
-			class161.bufferY[var13] = var30;
-
-			for (var14 = var15 = class161.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class161.directions[var11 - var9][var30 - var10]) {
-				if (var14 != var15) {
-					var15 = var14;
-					class161.bufferX[var31] = var11;
-					class161.bufferY[var31++] = var30;
-				}
-
-				if ((var14 & 2) != 0) {
-					++var11;
-				} else if ((var14 & 8) != 0) {
-					--var11;
-				}
-
-				if ((var14 & 1) != 0) {
-					++var30;
-				} else if ((var14 & 4) != 0) {
-					--var30;
-				}
-			}
-
-			var33 = 0;
-
-			while (var31-- > 0) {
-				var6[var33] = class161.bufferX[var31];
-				var7[var33++] = class161.bufferY[var31];
-				if (var33 >= var6.length) {
-					break;
-				}
-			}
-
-			return var33;
-		}
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lem;",
-		garbageValue = "1601574584"
-	)
-	@Export("getObjectDefinition")
-	public static ObjectComposition getObjectDefinition(int var0) {
-		ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0);
-			var1 = new ObjectComposition();
-			var1.id = var0;
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode();
-			if (var1.isSolid) {
-				var1.interactType = 0;
-				var1.boolean1 = false;
-			}
-
-			ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("gf")
-	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "-20"
-	)
-	@Export("addNpcsToScene")
-	static final void addNpcsToScene(boolean var0) {
-		for (int var1 = 0; var1 < Client.npcCount; ++var1) {
-			NPC var2 = Client.npcs[Client.npcIndices[var1]];
-			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) {
-				int var3 = var2.x >> 7;
-				int var4 = var2.y >> 7;
-				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
-					if (var2.field1023 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
-						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
-							continue;
-						}
-
-						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount;
-					}
-
-					long var5 = class171.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
-					var2.playerCycle = Client.cycle;
-					WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, var2.x, var2.y, class122.getTileHeight(var2.field1023 * 64 - 64 + var2.x, var2.field1023 * 64 - 64 + var2.y, GrandExchangeEvent.Client_plane), var2.field1023 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking);
-				}
-			}
-		}
-
-	}
 }

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

@@ -4,36 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("df")
+@ObfuscatedName("dr")
 @Implements("ClanChannelMember")
 public class ClanChannelMember {
 	@ObfuscatedName("n")
-	@Export("SpriteBuffer_spriteWidths")
-	static int[] SpriteBuffer_spriteWidths;
-	@ObfuscatedName("dy")
-	@ObfuscatedSignature(
-		descriptor = "Ljs;"
-	)
-	@Export("archive10")
-	static Archive archive10;
-	@ObfuscatedName("lq")
-	@ObfuscatedSignature(
-		descriptor = "Lbk;"
-	)
-	@Export("tempMenuAction")
-	static MenuAction tempMenuAction;
-	@ObfuscatedName("s")
 	@Export("rank")
 	public byte rank;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1633534337
+		intValue = -588092421
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
+		descriptor = "Lpp;"
 	)
 	@Export("username")
 	public Username username;

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

@@ -3,24 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lg")
+@ObfuscatedName("lq")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("ev")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljs;"
-	)
-	@Export("archive20")
-	static Archive archive20;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lli;"
+		descriptor = "Lmq;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lli;"
+		descriptor = "Lmq;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -30,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
+		descriptor = "(I)V",
+		garbageValue = "1897016674"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "939326138"
+		garbageValue = "-336350427"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -54,30 +48,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-642390933"
+		garbageValue = "-398895759"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = Canvas.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = class20.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1054730400"
+		garbageValue = "1635891604"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-270498617"
+		descriptor = "(B)Z",
+		garbageValue = "-1"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -88,13 +82,43 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1583864531"
+		garbageValue = "2025540605"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = Canvas.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = class20.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+	}
+
+	@ObfuscatedName("gr")
+	@ObfuscatedSignature(
+		descriptor = "(ZB)V",
+		garbageValue = "118"
+	)
+	@Export("addNpcsToScene")
+	static final void addNpcsToScene(boolean var0) {
+		for (int var1 = 0; var1 < Client.npcCount; ++var1) {
+			NPC var2 = Client.npcs[Client.npcIndices[var1]];
+			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) {
+				int var3 = var2.x >> 7;
+				int var4 = var2.y >> 7;
+				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
+					if (var2.field1137 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
+						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
+							continue;
+						}
+
+						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount;
+					}
+
+					long var5 = ClanSettings.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
+					var2.playerCycle = Client.cycle;
+					CollisionMap.scene.drawEntity(class391.Client_plane, var2.x, var2.y, GraphicsObject.getTileHeight(var2.field1137 * 64 - 64 + var2.x, var2.field1137 * 64 - 64 + var2.y, class391.Client_plane), var2.field1137 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking);
+				}
+			}
+		}
+
 	}
 }

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

@@ -4,121 +4,121 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dj")
+@ObfuscatedName("di")
 @Implements("ClanSettings")
 public class ClanSettings {
-	@ObfuscatedName("ag")
+	@ObfuscatedName("jh")
 	@ObfuscatedGetter(
-		intValue = 1726067789
+		intValue = -122094661
 	)
-	static int field1386;
-	@ObfuscatedName("t")
+	static int field1473;
+	@ObfuscatedName("c")
 	@Export("useHashes")
 	boolean useHashes;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("useNames")
 	boolean useNames;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		longValue = -4923692610489394701L
+		longValue = -4248189823971455173L
 	)
-	long field1370;
-	@ObfuscatedName("l")
+	long field1450;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 443357617
+		intValue = -794153821
 	)
-	int field1363;
-	@ObfuscatedName("n")
+	int field1451;
+	@ObfuscatedName("g")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -938288663
+		intValue = 2143631137
 	)
-	int field1364;
-	@ObfuscatedName("f")
+	int field1453;
+	@ObfuscatedName("a")
 	@Export("allowGuests")
 	public boolean allowGuests;
-	@ObfuscatedName("o")
-	public byte field1359;
-	@ObfuscatedName("x")
-	public byte field1368;
-	@ObfuscatedName("r")
-	public byte field1369;
-	@ObfuscatedName("p")
-	public byte field1383;
-	@ObfuscatedName("h")
+	@ObfuscatedName("u")
+	public byte field1448;
+	@ObfuscatedName("e")
+	public byte field1456;
+	@ObfuscatedName("l")
+	public byte field1457;
+	@ObfuscatedName("y")
+	public byte field1458;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 587263891
+		intValue = 920397121
 	)
 	@Export("memberCount")
 	public int memberCount;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@Export("memberHashes")
 	long[] memberHashes;
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@Export("memberRanks")
 	public byte[] memberRanks;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("u")
-	int[] field1375;
-	@ObfuscatedName("e")
-	public int[] field1376;
-	@ObfuscatedName("c")
-	public boolean[] field1377;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
+	int[] field1455;
+	@ObfuscatedName("q")
+	public int[] field1464;
+	@ObfuscatedName("j")
+	public boolean[] field1465;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -415560973
+		intValue = 739555235
 	)
 	@Export("currentOwner")
 	public int currentOwner;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = -1782839677
-	)
-	public int field1379;
 	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -147156049
+		intValue = -424494715
+	)
+	public int field1467;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 494071123
 	)
 	@Export("bannedMemberCount")
 	public int bannedMemberCount;
-	@ObfuscatedName("z")
+	@ObfuscatedName("r")
 	@Export("bannedMemberHashes")
 	long[] bannedMemberHashes;
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@Export("memberNames")
 	public String[] memberNames;
-	@ObfuscatedName("y")
+	@ObfuscatedName("w")
 	@Export("bannedMemberNames")
 	public String[] bannedMemberNames;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lmc;"
+		descriptor = "Lnz;"
 	)
 	@Export("parameters")
 	IterableNodeHashTable parameters;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;)V"
+		descriptor = "(Lot;)V"
 	)
 	public ClanSettings(Buffer var1) {
-		this.field1363 = 0;
+		this.field1451 = 0;
 		this.name = null;
-		this.field1364 = 0;
+		this.field1453 = 0;
 		this.currentOwner = -1;
-		this.field1379 = -1;
-		this.method2373(var1);
+		this.field1467 = -1;
+		this.method2572(var1);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-59"
+		descriptor = "(II)V",
+		garbageValue = "1876969444"
 	)
-	void method2356(int var1) {
+	void method2553(int var1) {
 		if (this.useHashes) {
 			if (this.memberHashes != null) {
 				System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount);
@@ -141,32 +141,32 @@ public class ClanSettings {
 			this.memberRanks = new byte[var1];
 		}
 
-		if (this.field1375 != null) {
-			System.arraycopy(this.field1375, 0, this.field1375 = new int[var1], 0, this.memberCount);
+		if (this.field1455 != null) {
+			System.arraycopy(this.field1455, 0, this.field1455 = new int[var1], 0, this.memberCount);
 		} else {
-			this.field1375 = new int[var1];
+			this.field1455 = new int[var1];
 		}
 
-		if (this.field1376 != null) {
-			System.arraycopy(this.field1376, 0, this.field1376 = new int[var1], 0, this.memberCount);
+		if (this.field1464 != null) {
+			System.arraycopy(this.field1464, 0, this.field1464 = new int[var1], 0, this.memberCount);
 		} else {
-			this.field1376 = new int[var1];
+			this.field1464 = new int[var1];
 		}
 
-		if (this.field1377 != null) {
-			System.arraycopy(this.field1377, 0, this.field1377 = new boolean[var1], 0, this.memberCount);
+		if (this.field1465 != null) {
+			System.arraycopy(this.field1465, 0, this.field1465 = new boolean[var1], 0, this.memberCount);
 		} else {
-			this.field1377 = new boolean[var1];
+			this.field1465 = new boolean[var1];
 		}
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1601035845"
+		descriptor = "(IB)V",
+		garbageValue = "3"
 	)
-	void method2357(int var1) {
+	void method2554(int var1) {
 		if (this.useHashes) {
 			if (this.bannedMemberHashes != null) {
 				System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount);
@@ -185,12 +185,12 @@ public class ClanSettings {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)I",
-		garbageValue = "90"
+		descriptor = "(Ljava/lang/String;S)I",
+		garbageValue = "-19234"
 	)
-	public int method2358(String var1) {
+	public int method2555(String var1) {
 		if (var1 != null && var1.length() != 0) {
 			for (int var2 = 0; var2 < this.memberCount; ++var2) {
 				if (this.memberNames[var2].equals(var1)) {
@@ -204,20 +204,20 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "-67"
+		descriptor = "(IIII)I",
+		garbageValue = "837971516"
 	)
-	public int method2376(int var1, int var2, int var3) {
+	public int method2556(int var1, int var2, int var3) {
 		int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1;
-		return (this.field1375[var1] & var4) >>> var2;
+		return (this.field1455[var1] & var4) >>> var2;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/Integer;",
-		garbageValue = "466934307"
+		garbageValue = "1337727344"
 	)
 	@Export("getTitleGroupValue")
 	public Integer getTitleGroupValue(int var1) {
@@ -229,10 +229,10 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(I)[I",
-		garbageValue = "-1963274445"
+		garbageValue = "-863400953"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
@@ -247,18 +247,18 @@ public class ClanSettings {
 				}
 			}
 
-			class282.method5133(var1, this.sortedMembers);
+			MouseHandler.method580(var1, this.sortedMembers);
 		}
 
 		return this.sortedMembers;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(JLjava/lang/String;II)V",
-		garbageValue = "615141967"
+		descriptor = "(JLjava/lang/String;IB)V",
+		garbageValue = "112"
 	)
-	void method2362(long var1, String var3, int var4) {
+	void method2559(long var1, String var3, int var4) {
 		if (var3 != null && var3.length() == 0) {
 			var3 = null;
 		}
@@ -269,7 +269,7 @@ public class ClanSettings {
 			throw new RuntimeException("");
 		} else {
 			if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) {
-				this.method2356(this.memberCount + 5);
+				this.method2553(this.memberCount + 5);
 			}
 
 			if (this.memberHashes != null) {
@@ -287,20 +287,20 @@ public class ClanSettings {
 				this.memberRanks[this.memberCount] = 0;
 			}
 
-			this.field1375[this.memberCount] = 0;
-			this.field1376[this.memberCount] = var4;
-			this.field1377[this.memberCount] = false;
+			this.field1455[this.memberCount] = 0;
+			this.field1464[this.memberCount] = var4;
+			this.field1465[this.memberCount] = false;
 			++this.memberCount;
 			this.sortedMembers = null;
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IS)V",
-		garbageValue = "255"
+		descriptor = "(II)V",
+		garbageValue = "2097117011"
 	)
-	void method2363(int var1) {
+	void method2560(int var1) {
 		if (var1 >= 0 && var1 < this.memberCount) {
 			--this.memberCount;
 			this.sortedMembers = null;
@@ -308,16 +308,16 @@ public class ClanSettings {
 				this.memberHashes = null;
 				this.memberNames = null;
 				this.memberRanks = null;
-				this.field1375 = null;
-				this.field1376 = null;
-				this.field1377 = null;
+				this.field1455 = null;
+				this.field1464 = null;
+				this.field1465 = null;
 				this.currentOwner = -1;
-				this.field1379 = -1;
+				this.field1467 = -1;
 			} else {
 				System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1);
-				System.arraycopy(this.field1375, var1 + 1, this.field1375, var1, this.memberCount - var1);
-				System.arraycopy(this.field1376, var1 + 1, this.field1376, var1, this.memberCount - var1);
-				System.arraycopy(this.field1377, var1 + 1, this.field1377, var1, this.memberCount - var1);
+				System.arraycopy(this.field1455, var1 + 1, this.field1455, var1, this.memberCount - var1);
+				System.arraycopy(this.field1464, var1 + 1, this.field1464, var1, this.memberCount - var1);
+				System.arraycopy(this.field1465, var1 + 1, this.field1465, var1, this.memberCount - var1);
 				if (this.memberHashes != null) {
 					System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1);
 				}
@@ -334,32 +334,32 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-98"
+		descriptor = "(I)V",
+		garbageValue = "1840538836"
 	)
 	@Export("updateOwner")
 	void updateOwner() {
 		if (this.memberCount == 0) {
 			this.currentOwner = -1;
-			this.field1379 = -1;
+			this.field1467 = -1;
 		} else {
 			this.currentOwner = -1;
-			this.field1379 = -1;
+			this.field1467 = -1;
 			int var1 = 0;
 			byte var2 = this.memberRanks[0];
 
 			for (int var3 = 1; var3 < this.memberCount; ++var3) {
 				if (this.memberRanks[var3] > var2) {
 					if (var2 == 125) {
-						this.field1379 = var1;
+						this.field1467 = var1;
 					}
 
 					var1 = var3;
 					var2 = this.memberRanks[var3];
-				} else if (this.field1379 == -1 && this.memberRanks[var3] == 125) {
-					this.field1379 = var3;
+				} else if (this.field1467 == -1 && this.memberRanks[var3] == 125) {
+					this.field1467 = var3;
 				}
 			}
 
@@ -371,23 +371,23 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(JLjava/lang/String;I)V",
-		garbageValue = "332285009"
+		garbageValue = "1091435278"
 	)
-	void method2365(long var1, String var3) {
+	void method2562(long var1, String var3) {
 		if (var3 != null && var3.length() == 0) {
 			var3 = null;
 		}
 
 		if (var1 > 0L != this.useHashes) {
 			throw new RuntimeException("");
-		} else if (var3 != null != this.useNames) {
+		} else if (this.useNames != (var3 != null)) {
 			throw new RuntimeException("");
 		} else {
 			if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) {
-				this.method2357(this.bannedMemberCount + 5);
+				this.method2554(this.bannedMemberCount + 5);
 			}
 
 			if (this.bannedMemberHashes != null) {
@@ -402,12 +402,12 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1206007448"
+		descriptor = "(IB)V",
+		garbageValue = "126"
 	)
-	void method2366(int var1) {
+	void method2589(int var1) {
 		--this.bannedMemberCount;
 		if (this.bannedMemberCount == 0) {
 			this.bannedMemberHashes = null;
@@ -424,14 +424,14 @@ public class ClanSettings {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IBB)I",
-		garbageValue = "-54"
+		descriptor = "(IBI)I",
+		garbageValue = "131072"
 	)
-	int method2367(int var1, byte var2) {
+	int method2581(int var1, byte var2) {
 		if (var2 != 126 && var2 != 127) {
-			if (this.currentOwner == var1 && (this.field1379 == -1 || this.memberRanks[this.field1379] < 125)) {
+			if (this.currentOwner == var1 && (this.field1467 == -1 || this.memberRanks[this.field1467] < 125)) {
 				return -1;
 			} else if (this.memberRanks[var1] == var2) {
 				return -1;
@@ -445,15 +445,15 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-1906521542"
+		garbageValue = "-1783852977"
 	)
-	boolean method2368(int var1) {
+	boolean method2565(int var1) {
 		if (this.currentOwner != var1 && this.memberRanks[var1] != 126) {
 			this.memberRanks[this.currentOwner] = 125;
-			this.field1379 = this.currentOwner;
+			this.field1467 = this.currentOwner;
 			this.memberRanks[var1] = 126;
 			this.currentOwner = var1;
 			return true;
@@ -462,47 +462,47 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(IZI)I",
-		garbageValue = "-1332808385"
+		garbageValue = "-1048131256"
 	)
-	int method2369(int var1, boolean var2) {
-		if (this.field1377[var1] == var2) {
+	int method2590(int var1, boolean var2) {
+		if (this.field1465[var1] == var2) {
 			return -1;
 		} else {
-			this.field1377[var1] = var2;
+			this.field1465[var1] = var2;
 			return var1;
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)I",
-		garbageValue = "1046292707"
+		garbageValue = "1776479044"
 	)
-	int method2370(int var1, int var2, int var3, int var4) {
+	int method2614(int var1, int var2, int var3, int var4) {
 		int var5 = (1 << var3) - 1;
 		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1;
 		int var7 = var6 ^ var5;
 		var2 <<= var3;
 		var2 &= var7;
-		int var8 = this.field1375[var1];
+		int var8 = this.field1455[var1];
 		if ((var8 & var7) == var2) {
 			return -1;
 		} else {
 			var8 &= ~var7;
-			this.field1375[var1] = var8 | var2;
+			this.field1455[var1] = var8 | var2;
 			return var1;
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)Z",
-		garbageValue = "-123"
+		garbageValue = "87"
 	)
-	boolean method2371(int var1, int var2) {
+	boolean method2568(int var1, int var2) {
 		if (this.parameters != null) {
 			Node var3 = this.parameters.get((long)var1);
 			if (var3 != null) {
@@ -526,12 +526,12 @@ public class ClanSettings {
 		return true;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)Z",
-		garbageValue = "-68"
+		descriptor = "(IIIII)Z",
+		garbageValue = "1354627129"
 	)
-	boolean method2372(int var1, int var2, int var3, int var4) {
+	boolean method2569(int var1, int var2, int var3, int var4) {
 		int var5 = (1 << var3) - 1;
 		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1;
 		int var7 = var6 ^ var5;
@@ -561,18 +561,18 @@ public class ClanSettings {
 		return true;
 	}
 
-	@ObfuscatedName("e")
-	boolean method2400(int var1, long var2) {
+	@ObfuscatedName("q")
+	boolean method2570(int var1, long var2) {
 		if (this.parameters != null) {
 			Node var4 = this.parameters.get((long)var1);
 			if (var4 != null) {
-				if (var4 instanceof class351) {
-					class351 var5 = (class351)var4;
-					if (var2 == var5.field3962) {
+				if (var4 instanceof class366) {
+					class366 var5 = (class366)var4;
+					if (var2 == var5.field4052) {
 						return false;
 					}
 
-					var5.field3962 = var2;
+					var5.field4052 = var2;
 					return true;
 				}
 
@@ -582,16 +582,16 @@ public class ClanSettings {
 			this.parameters = new IterableNodeHashTable(4);
 		}
 
-		this.parameters.put(new class351(var2), (long)var1);
+		this.parameters.put(new class366(var2), (long)var1);
 		return true;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;I)Z",
-		garbageValue = "225314993"
+		descriptor = "(ILjava/lang/String;B)Z",
+		garbageValue = "28"
 	)
-	boolean method2377(int var1, String var2) {
+	boolean method2571(int var1, String var2) {
 		if (var2 == null) {
 			var2 = "";
 		} else if (var2.length() > 80) {
@@ -624,12 +624,12 @@ public class ClanSettings {
 		return true;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;I)V",
-		garbageValue = "-1016465187"
+		descriptor = "(Lot;I)V",
+		garbageValue = "1646828781"
 	)
-	void method2373(Buffer var1) {
+	void method2572(Buffer var1) {
 		int var2 = var1.readUnsignedByte();
 		if (var2 >= 1 && var2 <= 6) {
 			int var3 = var1.readUnsignedByte();
@@ -651,10 +651,10 @@ public class ClanSettings {
 				this.bannedMemberNames = null;
 			}
 
-			this.field1363 = var1.readInt();
-			this.field1364 = var1.readInt();
-			if (var2 <= 3 && this.field1364 != 0) {
-				this.field1364 += 16912800;
+			this.field1451 = var1.readInt();
+			this.field1453 = var1.readInt();
+			if (var2 <= 3 && this.field1453 != 0) {
+				this.field1453 += 16912800;
 			}
 
 			this.memberCount = var1.readUnsignedShort();
@@ -665,10 +665,10 @@ public class ClanSettings {
 			}
 
 			this.allowGuests = var1.readUnsignedByte() == 1;
-			this.field1359 = var1.readByte();
-			this.field1368 = var1.readByte();
-			this.field1369 = var1.readByte();
-			this.field1383 = var1.readByte();
+			this.field1448 = var1.readByte();
+			this.field1456 = var1.readByte();
+			this.field1457 = var1.readByte();
+			this.field1458 = var1.readByte();
 			int var4;
 			if (this.memberCount > 0) {
 				if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) {
@@ -683,16 +683,16 @@ public class ClanSettings {
 					this.memberRanks = new byte[this.memberCount];
 				}
 
-				if (this.field1375 == null || this.field1375.length < this.memberCount) {
-					this.field1375 = new int[this.memberCount];
+				if (this.field1455 == null || this.field1455.length < this.memberCount) {
+					this.field1455 = new int[this.memberCount];
 				}
 
-				if (this.field1376 == null || this.field1376.length < this.memberCount) {
-					this.field1376 = new int[this.memberCount];
+				if (this.field1464 == null || this.field1464.length < this.memberCount) {
+					this.field1464 = new int[this.memberCount];
 				}
 
-				if (this.field1377 == null || this.field1377.length < this.memberCount) {
-					this.field1377 = new boolean[this.memberCount];
+				if (this.field1465 == null || this.field1465.length < this.memberCount) {
+					this.field1465 = new boolean[this.memberCount];
 				}
 
 				for (var4 = 0; var4 < this.memberCount; ++var4) {
@@ -706,19 +706,19 @@ public class ClanSettings {
 
 					this.memberRanks[var4] = var1.readByte();
 					if (var2 >= 2) {
-						this.field1375[var4] = var1.readInt();
+						this.field1455[var4] = var1.readInt();
 					}
 
 					if (var2 >= 5) {
-						this.field1376[var4] = var1.readUnsignedShort();
+						this.field1464[var4] = var1.readUnsignedShort();
 					} else {
-						this.field1376[var4] = 0;
+						this.field1464[var4] = 0;
 					}
 
 					if (var2 >= 6) {
-						this.field1377[var4] = var1.readUnsignedByte() == 1;
+						this.field1465[var4] = var1.readUnsignedByte() == 1;
 					} else {
-						this.field1377[var4] = false;
+						this.field1465[var4] = false;
 					}
 				}
 
@@ -748,7 +748,7 @@ public class ClanSettings {
 			if (var2 >= 3) {
 				var4 = var1.readUnsignedShort();
 				if (var4 > 0) {
-					this.parameters = new IterableNodeHashTable(var4 < 16 ? SoundSystem.method530(var4) : 16);
+					this.parameters = new IterableNodeHashTable(var4 < 16 ? ItemContainer.method2041(var4) : 16);
 
 					while (var4-- > 0) {
 						int var5 = var1.readInt();
@@ -759,7 +759,7 @@ public class ClanSettings {
 							this.parameters.put(new IntegerNode(var12), (long)var6);
 						} else if (var7 == 1) {
 							long var10 = var1.readLong();
-							this.parameters.put(new class351(var10), (long)var6);
+							this.parameters.put(new class366(var10), (long)var6);
 						} else if (var7 == 2) {
 							String var8 = var1.readStringCp1252NullTerminated();
 							this.parameters.put(new ObjectNode(var8), (long)var6);
@@ -773,33 +773,60 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-2091268919"
+		descriptor = "(DDIB)[D",
+		garbageValue = "83"
 	)
-	public static boolean method2417(int var0) {
-		return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false;
+	public static double[] method2587(double var0, double var2, int var4) {
+		int var5 = var4 * 2 + 1;
+		double[] var6 = new double[var5];
+		int var7 = -var4;
+
+		for (int var8 = 0; var7 <= var4; ++var8) {
+			double var11 = Tile.method4044(((double)var7 - var0) / var2) / var2;
+			var6[var8] = var11;
+			++var7;
+		}
+
+		return var6;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-841895642"
+		descriptor = "(IIIZIB)J",
+		garbageValue = "-34"
 	)
-	public static boolean method2421(int var0) {
-		return var0 >= WorldMapDecorationType.field3148.id && var0 <= WorldMapDecorationType.field3142.id || var0 == WorldMapDecorationType.field3159.id;
+	@Export("calculateTag")
+	public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
+		long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17;
+		if (var3) {
+			var5 |= 65536L;
+		}
+
+		return var5;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("gb")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1470733361"
+		garbageValue = "-997709886"
 	)
-	static void method2422() {
-		Login.worldSelectOpen = false;
-		Login.leftTitleSprite.drawAt(Login.xPadding, 0);
-		Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
-		UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18);
+	static final void method2624() {
+		Client.field602 = 0;
+		int var0 = (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX;
+		int var1 = (class129.localPlayer.y >> 7) + class320.baseY;
+		if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) {
+			Client.field602 = 1;
+		}
+
+		if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) {
+			Client.field602 = 1;
+		}
+
+		if (Client.field602 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) {
+			Client.field602 = 0;
+		}
+
 	}
 }

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

@@ -1,104 +1,105 @@
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
-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;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bp")
+@ObfuscatedName("cx")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1092227393
+		intValue = -764103933
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+	@ObfuscatedName("fs")
+	@ObfuscatedGetter(
+		intValue = 908401167
 	)
-	@Export("KitDefinition_modelsArchive")
-	public static AbstractArchive KitDefinition_modelsArchive;
-	@ObfuscatedName("b")
-	@Export("operatingSystemName")
-	static String operatingSystemName;
-	@ObfuscatedName("v")
+	@Export("currentPort")
+	static int currentPort;
+	@ObfuscatedName("m")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1426015777
+		intValue = 1524960687
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("f")
-	double field1117;
-	@ObfuscatedName("o")
+	@ObfuscatedName("a")
+	double field1193;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1197443065
+		intValue = -970652687
 	)
 	@Export("musicVolume")
 	int musicVolume;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1564342051
+		intValue = -753455133
 	)
 	@Export("soundEffectsVolume")
 	int soundEffectsVolume;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1303154967
+		intValue = 611081845
 	)
 	@Export("areaSoundEffectsVolume")
 	int areaSoundEffectsVolume;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1860802513
+	)
+	int field1192;
+	@ObfuscatedName("v")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
 	static {
-		ClientPreferences_optionCount = 7;
+		ClientPreferences_optionCount = 8;
 	}
 
 	ClientPreferences() {
 		this.windowMode = 1;
 		this.rememberedUsername = null;
 		this.hideUsername = false;
-		this.field1117 = 0.8D;
+		this.field1193 = 0.8D;
 		this.musicVolume = 127;
 		this.soundEffectsVolume = 127;
 		this.areaSoundEffectsVolume = 127;
+		this.field1192 = -1;
 		this.parameters = new LinkedHashMap();
-		this.method1937(true);
+		this.method2185(true);
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;)V"
+		descriptor = "(Lot;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
 		this.rememberedUsername = null;
 		this.hideUsername = false;
-		this.field1117 = 0.8D;
+		this.field1193 = 0.8D;
 		this.musicVolume = 127;
 		this.soundEffectsVolume = 127;
 		this.areaSoundEffectsVolume = 127;
+		this.field1192 = -1;
 		this.parameters = new LinkedHashMap();
 		if (var1 != null && var1.array != null) {
 			int var2 = var1.readUnsignedByte();
@@ -134,32 +135,36 @@ public class ClientPreferences {
 				}
 
 				if (var2 > 6) {
-					this.field1117 = (double)var1.readUnsignedByte() / 100.0D;
+					this.field1193 = (double)var1.readUnsignedByte() / 100.0D;
 					this.musicVolume = var1.readUnsignedByte();
 					this.soundEffectsVolume = var1.readUnsignedByte();
 					this.areaSoundEffectsVolume = var1.readUnsignedByte();
 				}
+
+				if (var2 > 7) {
+					this.field1192 = var1.readUnsignedByte();
+				}
 			} else {
-				this.method1937(true);
+				this.method2185(true);
 			}
 		} else {
-			this.method1937(true);
+			this.method2185(true);
 		}
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "909536447"
+		garbageValue = "1497380914"
 	)
-	void method1937(boolean var1) {
+	void method2185(boolean var1) {
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnv;",
-		garbageValue = "2036795437"
+		descriptor = "(I)Lot;",
+		garbageValue = "1683782622"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -179,49 +184,404 @@ public class ClientPreferences {
 
 		var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : "");
 		var1.writeBoolean(this.hideUsername);
-		var1.writeByte((int)(this.field1117 * 100.0D));
+		var1.writeByte((int)(100.0D * this.field1193));
 		var1.writeByte(this.musicVolume);
 		var1.writeByte(this.soundEffectsVolume);
 		var1.writeByte(this.areaSoundEffectsVolume);
+		var1.writeByte(this.field1192);
 		return var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "([BB)Lom;",
-		garbageValue = "12"
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "60"
 	)
-	@Export("convertJpgToSprite")
-	public static final SpritePixels convertJpgToSprite(byte[] var0) {
-		BufferedImage var1 = null;
+	static int method2200(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.FRIEND_COUNT) {
+			if (class20.friendSystem.field793 == 0) {
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -2;
+			} else if (class20.friendSystem.field793 == 1) {
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+			} else {
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.friendsList.getSize();
+			}
 
-		try {
-			var1 = ImageIO.read(new ByteArrayInputStream(var0));
-			int var2 = var1.getWidth();
-			int var3 = var1.getHeight();
-			int[] var4 = new int[var2 * var3];
-			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
-			var5.grabPixels();
-			return new SpritePixels(var4, var2, var3);
-		} catch (IOException var7) {
-		} catch (InterruptedException var8) {
+			return 1;
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
+				var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.friendsList.getSize()) {
+					Friend var8 = (Friend)class20.friendSystem.friendsList.get(var3);
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName();
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName();
+				} else {
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
+				var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.friendsList.getSize()) {
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class20.friendSystem.friendsList.get(var3)).world;
+				} else {
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
+				var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.friendsList.getSize()) {
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class20.friendSystem.friendsList.get(var3)).rank;
+				} else {
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			} else {
+				String var5;
+				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					int var6 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					SceneTilePaint.method4479(var5, var6);
+					return 1;
+				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					class20.friendSystem.addFriend(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					class20.friendSystem.removeFriend(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					class20.friendSystem.addIgnore(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					class20.friendSystem.removeIgnore(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					var5 = WorldMapArea.method3513(var5);
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.isFriended(new Username(var5, SoundCache.loginType), false) ? 1 : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
+					if (class78.friendsChat != null) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class78.friendsChat.name;
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
+					if (class78.friendsChat != null) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class78.friendsChat.getSize();
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class78.friendsChat != null && var3 < class78.friendsChat.getSize()) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class78.friendsChat.get(var3).getUsername().getName();
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class78.friendsChat != null && var3 < class78.friendsChat.getSize()) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class78.friendsChat.get(var3)).getWorld();
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class78.friendsChat != null && var3 < class78.friendsChat.getSize()) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class78.friendsChat.get(var3)).rank;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class78.friendsChat != null ? class78.friendsChat.minKick : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					WorldMapData_0.clanKickUser(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class78.friendsChat != null ? class78.friendsChat.rank * -871547187 * 342416901 : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					MidiPcmStream.Clan_joinChat(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
+					Players.Clan_leaveChat();
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
+					if (!class20.friendSystem.method1682()) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.ignoreList.getSize();
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.ignoreList.getSize()) {
+						Ignored var4 = (Ignored)class20.friendSystem.ignoreList.get(var3);
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName();
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName();
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					var5 = WorldMapArea.method3513(var5);
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.isIgnored(new Username(var5, SoundCache.loginType)) ? 1 : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class78.friendsChat != null && var3 < class78.friendsChat.getSize() && class78.friendsChat.get(var3).getUsername().equals(class129.localPlayer.username)) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
+					if (class78.friendsChat != null && class78.friendsChat.owner != null) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class78.friendsChat.owner;
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class78.friendsChat != null && var3 < class78.friendsChat.getSize() && ((ClanMate)class78.friendsChat.get(var3)).isFriend()) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
+					if (var0 == 3628) {
+						class20.friendSystem.friendsList.removeComparator();
+						return 1;
+					} else {
+						boolean var7;
+						if (var0 == 3629) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator1(var7));
+							return 1;
+						} else if (var0 == 3630) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator2(var7));
+							return 1;
+						} else if (var0 == 3631) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator3(var7));
+							return 1;
+						} else if (var0 == 3632) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator4(var7));
+							return 1;
+						} else if (var0 == 3633) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator5(var7));
+							return 1;
+						} else if (var0 == 3634) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator6(var7));
+							return 1;
+						} else if (var0 == 3635) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator7(var7));
+							return 1;
+						} else if (var0 == 3636) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator8(var7));
+							return 1;
+						} else if (var0 == 3637) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator9(var7));
+							return 1;
+						} else if (var0 == 3638) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new UserComparator10(var7));
+							return 1;
+						} else if (var0 == 3639) {
+							class20.friendSystem.friendsList.sort();
+							return 1;
+						} else if (var0 == 3640) {
+							class20.friendSystem.ignoreList.removeComparator();
+							return 1;
+						} else if (var0 == 3641) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
+							return 1;
+						} else if (var0 == 3642) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
+							return 1;
+						} else if (var0 == 3643) {
+							class20.friendSystem.ignoreList.sort();
+							return 1;
+						} else if (var0 == 3644) {
+							if (class78.friendsChat != null) {
+								class78.friendsChat.removeComparator();
+							}
+
+							return 1;
+						} else if (var0 == 3645) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator1(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3646) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator2(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3647) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator3(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3648) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator4(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3649) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator5(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3650) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator6(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3651) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator7(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3652) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator8(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3653) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator9(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3654) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new UserComparator10(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3655) {
+							if (class78.friendsChat != null) {
+								class78.friendsChat.sort();
+							}
+
+							return 1;
+						} else if (var0 == 3656) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							class20.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7));
+							return 1;
+						} else if (var0 == 3657) {
+							var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1;
+							if (class78.friendsChat != null) {
+								class78.friendsChat.addComparator(new BuddyRankComparator(var7));
+							}
+
+							return 1;
+						} else {
+							return 2;
+						}
+					}
+				} else {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					if (class78.friendsChat != null && var3 < class78.friendsChat.getSize() && ((ClanMate)class78.friendsChat.get(var3)).isIgnored()) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				}
+			}
 		}
-
-		return new SpritePixels(0, 0);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("kz")
 	@ObfuscatedSignature(
-		descriptor = "(I)[I",
-		garbageValue = "578056164"
+		descriptor = "(Lot;I)V",
+		garbageValue = "-1413738331"
 	)
-	public static int[] method1942() {
-		int[] var0 = new int[KeyHandler.field64];
+	static void method2195(Buffer var0) {
+		if (Client.randomDatData != null) {
+			var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
+		} else {
+			byte[] var2 = new byte[24];
 
-		for (int var1 = 0; var1 < KeyHandler.field64; ++var1) {
-			var0[var1] = KeyHandler.field55[var1];
+			try {
+				JagexCache.JagexCache_randomDat.seek(0L);
+				JagexCache.JagexCache_randomDat.readFully(var2);
+
+				int var3;
+				for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) {
+				}
+
+				if (var3 >= 24) {
+					throw new IOException();
+				}
+			} catch (Exception var6) {
+				for (int var4 = 0; var4 < 24; ++var4) {
+					var2[var4] = -1;
+				}
+			}
+
+			var0.writeBytes(var2, 0, var2.length);
 		}
-
-		return var0;
 	}
 }

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

@@ -9,95 +9,94 @@ public abstract class Clock {
 	Clock() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-296506208"
+		garbageValue = "2146592699"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "2079435375"
+		garbageValue = "-1080855684"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "2118281841"
+		descriptor = "(Ljava/lang/CharSequence;I)[B",
+		garbageValue = "780597334"
 	)
-	public static String method2680(CharSequence var0) {
+	public static byte[] method2797(CharSequence var0) {
 		int var1 = var0.length();
-		StringBuilder var2 = new StringBuilder(var1);
+		byte[] var2 = new byte[var1];
 
 		for (int var3 = 0; var3 < var1; ++var3) {
 			char var4 = var0.charAt(var3);
-			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
-				if (var4 == ' ') {
-					var2.append('+');
-				} else {
-					byte var5 = ArchiveDiskActionHandler.charToByteCp1252(var4);
-					var2.append('%');
-					int var6 = var5 >> 4 & 15;
-					if (var6 >= 10) {
-						var2.append((char)(var6 + 55));
-					} else {
-						var2.append((char)(var6 + 48));
-					}
-
-					var6 = var5 & 15;
-					if (var6 >= 10) {
-						var2.append((char)(var6 + 55));
-					} else {
-						var2.append((char)(var6 + 48));
-					}
-				}
+			if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) {
+				var2[var3] = (byte)var4;
+			} else if (var4 == 8364) {
+				var2[var3] = -128;
+			} else if (var4 == 8218) {
+				var2[var3] = -126;
+			} else if (var4 == 402) {
+				var2[var3] = -125;
+			} else if (var4 == 8222) {
+				var2[var3] = -124;
+			} else if (var4 == 8230) {
+				var2[var3] = -123;
+			} else if (var4 == 8224) {
+				var2[var3] = -122;
+			} else if (var4 == 8225) {
+				var2[var3] = -121;
+			} else if (var4 == 710) {
+				var2[var3] = -120;
+			} else if (var4 == 8240) {
+				var2[var3] = -119;
+			} else if (var4 == 352) {
+				var2[var3] = -118;
+			} else if (var4 == 8249) {
+				var2[var3] = -117;
+			} else if (var4 == 338) {
+				var2[var3] = -116;
+			} else if (var4 == 381) {
+				var2[var3] = -114;
+			} else if (var4 == 8216) {
+				var2[var3] = -111;
+			} else if (var4 == 8217) {
+				var2[var3] = -110;
+			} else if (var4 == 8220) {
+				var2[var3] = -109;
+			} else if (var4 == 8221) {
+				var2[var3] = -108;
+			} else if (var4 == 8226) {
+				var2[var3] = -107;
+			} else if (var4 == 8211) {
+				var2[var3] = -106;
+			} else if (var4 == 8212) {
+				var2[var3] = -105;
+			} else if (var4 == 732) {
+				var2[var3] = -104;
+			} else if (var4 == 8482) {
+				var2[var3] = -103;
+			} else if (var4 == 353) {
+				var2[var3] = -102;
+			} else if (var4 == 8250) {
+				var2[var3] = -101;
+			} else if (var4 == 339) {
+				var2[var3] = -100;
+			} else if (var4 == 382) {
+				var2[var3] = -98;
+			} else if (var4 == 376) {
+				var2[var3] = -97;
 			} else {
-				var2.append(var4);
+				var2[var3] = 63;
 			}
 		}
 
-		return var2.toString();
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "96"
-	)
-	static void method2673(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1);
-		NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2);
-		if (var4 != null) {
-			NetCache.NetCache_pendingWritesQueue.addLast(var4);
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(CB)C",
-		garbageValue = "45"
-	)
-	static char method2679(char var0) {
-		return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0;
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)[I",
-		garbageValue = "1562582699"
-	)
-	public static int[] method2682() {
-		int[] var0 = new int[KeyHandler.field35];
-
-		for (int var1 = 0; var1 < KeyHandler.field35; ++var1) {
-			var0[var1] = KeyHandler.field53[var1];
-		}
-
-		return var0;
+		return var2;
 	}
 }

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

@@ -4,34 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fy")
+@ObfuscatedName("fk")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("ax")
+	@ObfuscatedName("hg")
+	@ObfuscatedSignature(
+		descriptor = "Lhz;"
+	)
+	@Export("scene")
+	static Scene scene;
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -97625897
+		intValue = 1575215681
 	)
 	@Export("xInset")
 	int xInset;
-	@ObfuscatedName("au")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1592986103
+		intValue = 915712019
 	)
 	@Export("yInset")
 	int yInset;
-	@ObfuscatedName("av")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 1072743371
+		intValue = -1266509267
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("as")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -1185927055
+		intValue = -150393545
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@Export("flags")
 	public int[][] flags;
 
@@ -44,10 +50,10 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "269494942"
+		garbageValue = "632103372"
 	)
 	@Export("clear")
 	public void clear() {
@@ -63,12 +69,12 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIZI)V",
-		garbageValue = "-1299948758"
+		descriptor = "(IIIIZB)V",
+		garbageValue = "0"
 	)
-	public void method3171(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3320(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -215,10 +221,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "-1986797422"
+		garbageValue = "-2007282715"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -242,10 +248,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-67"
+		descriptor = "(III)V",
+		garbageValue = "-2128028383"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -255,10 +261,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-694805867"
+		garbageValue = "1128644091"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -268,10 +274,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(IIIB)V",
-		garbageValue = "0"
+		garbageValue = "-1"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -279,12 +285,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIZI)V",
-		garbageValue = "74052797"
+		descriptor = "(IIIIZB)V",
+		garbageValue = "5"
 	)
-	public void method3176(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3325(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -431,10 +437,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIZI)V",
-		garbageValue = "1271706136"
+		descriptor = "(IIIIIZB)V",
+		garbageValue = "-28"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -464,10 +470,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-1119202774"
+		descriptor = "(IIIB)V",
+		garbageValue = "1"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -475,33 +481,41 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-2137873590"
+		descriptor = "(IIB)V",
+		garbageValue = "126"
 	)
-	public void method3200(int var1, int var2) {
+	public void method3321(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lhg;",
-		garbageValue = "0"
+		descriptor = "(I)V",
+		garbageValue = "2080076095"
 	)
-	public static PacketBufferNode method3205() {
-		return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount];
+	static void method3351() {
+		ItemContainer.itemContainers = new NodeHashTable(32);
 	}
 
-	@ObfuscatedName("ih")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1173272603"
+		descriptor = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "1850149245"
 	)
-	static final int method3204() {
-		return Client.menuOptionsCount - 1;
+	@Export("hashString")
+	public static int hashString(CharSequence var0) {
+		int var1 = var0.length();
+		int var2 = 0;
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var2 = (var2 << 5) - var2 + WorldMapSection2.charToByteCp1252(var0.charAt(var3));
+		}
+
+		return var2;
 	}
 }

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

@@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ij")
+@ObfuscatedName("iy")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("lo")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Lkl;"
 	)
-	@Export("mousedOverWidgetIf1")
-	static Widget mousedOverWidgetIf1;
-	@ObfuscatedName("s")
+	@Export("NetCache_currentResponse")
+	public static NetFileRequest NetCache_currentResponse;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1536626137
+		intValue = -1108406109
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -2010801875
+		intValue = -369767487
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 724560647
+		intValue = 2035446807
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lij;)V"
+		descriptor = "(Liy;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -58,20 +58,20 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "1"
+		descriptor = "(I)I",
+		garbageValue = "-146290251"
 	)
 	@Export("packed")
 	public int packed() {
-		return this.plane << 28 | this.x << 14 | this.y;
+		return FontName.method6551(this.plane, this.x, this.y);
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lij;I)Z",
-		garbageValue = "1077845363"
+		descriptor = "(Liy;I)Z",
+		garbageValue = "1023971134"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -84,16 +84,20 @@ public class Coord {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1959395085"
+		garbageValue = "-1260283886"
 	)
 	@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 String toString() {
+		return this.toString(",");
+	}
+
 	public boolean equals(Object var1) {
 		if (this == var1) {
 			return true;
@@ -106,7 +110,151 @@ public class Coord {
 		return this.packed();
 	}
 
-	public String toString() {
-		return this.toString(",");
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "([Lbh;II[I[IB)V",
+		garbageValue = "37"
+	)
+	@Export("sortWorlds")
+	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+		if (var1 < var2) {
+			int var5 = var1 - 1;
+			int var6 = var2 + 1;
+			int var7 = (var2 + var1) / 2;
+			World var8 = var0[var7];
+			var0[var7] = var0[var1];
+			var0[var1] = var8;
+
+			while (var5 < var6) {
+				boolean var9 = true;
+
+				int var10;
+				int var11;
+				int var12;
+				do {
+					--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 (var11 != var12) {
+							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 (var11 != var12) {
+							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;
+				}
+			}
+
+			sortWorlds(var0, var1, var6, var3, var4);
+			sortWorlds(var0, var6 + 1, var2, var3, var4);
+		}
+
+	}
+
+	@ObfuscatedName("iq")
+	@ObfuscatedSignature(
+		descriptor = "([Ljd;IIIZB)V",
+		garbageValue = "-55"
+	)
+	@Export("resizeInterface")
+	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+		for (int var5 = 0; var5 < var0.length; ++var5) {
+			Widget var6 = var0[var5];
+			if (var6 != null && var6.parentId == var1) {
+				UrlRequest.alignWidgetSize(var6, var2, var3, var4);
+				class128.alignWidgetPosition(var6, var2, var3);
+				if (var6.scrollX > var6.scrollWidth - var6.width) {
+					var6.scrollX = var6.scrollWidth - var6.width;
+				}
+
+				if (var6.scrollX < 0) {
+					var6.scrollX = 0;
+				}
+
+				if (var6.scrollY > var6.scrollHeight - var6.height) {
+					var6.scrollY = var6.scrollHeight - var6.height;
+				}
+
+				if (var6.scrollY < 0) {
+					var6.scrollY = 0;
+				}
+
+				if (var6.type == 0) {
+					VerticalAlignment.revalidateWidgetScroll(var0, var6, var4);
+				}
+			}
+		}
+
 	}
 }

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

@@ -4,52 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ao")
+@ObfuscatedName("af")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("si")
+	@ObfuscatedName("aa")
+	@Export("fontHelvetica13")
+	static java.awt.Font fontHelvetica13;
+	@ObfuscatedName("ko")
 	@ObfuscatedSignature(
-		descriptor = "Lbp;"
+		descriptor = "Ljd;"
 	)
-	@Export("clientPreferences")
-	static ClientPreferences clientPreferences;
-	@ObfuscatedName("dh")
-	@ObfuscatedSignature(
-		descriptor = "Ljs;"
-	)
-	@Export("archive3")
-	static Archive archive3;
-	@ObfuscatedName("ef")
-	@ObfuscatedSignature(
-		descriptor = "Ljs;"
-	)
-	@Export("archive19")
-	static Archive archive19;
-	@ObfuscatedName("oo")
-	@ObfuscatedSignature(
-		descriptor = "Lci;"
-	)
-	@Export("varcs")
-	static Varcs varcs;
-	@ObfuscatedName("j")
+	@Export("dragInventoryWidget")
+	static Widget dragInventoryWidget;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 615174595
+		intValue = -1732554665
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -455379073
+		intValue = 1267116301
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) {
-			int var3 = WorldMapRectangle.method3644(var1, var2);
+			int var3 = BufferedSink.method6167(var1, var2);
 			var1 /= var3;
 			var2 /= var3;
 			this.inputRate = var1;
@@ -58,7 +43,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;
@@ -84,10 +69,10 @@ public class Decimator {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "([BB)[B",
-		garbageValue = "-110"
+		descriptor = "([BS)[B",
+		garbageValue = "7233"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
@@ -104,7 +89,7 @@ public class Decimator {
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var9 + var4] += var8[var9] * var7;
+					var3[var4 + var9] += var7 * var8[var9];
 				}
 
 				var5 += this.outputRate;
@@ -130,10 +115,10 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "2124856027"
+		descriptor = "(IB)I",
+		garbageValue = "-58"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
@@ -144,10 +129,10 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-1182254133"
+		garbageValue = "208366738"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
@@ -158,47 +143,83 @@ public class Decimator {
 		return var1;
 	}
 
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(Lkk;IIIZI)V",
+		garbageValue = "1487110181"
+	)
+	public static void method1051(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
+		class247.musicPlayerStatus = 1;
+		class247.musicTrackArchive = var0;
+		class247.musicTrackGroupId = var1;
+		GrandExchangeOfferOwnWorldComparator.musicTrackFileId = var2;
+		class196.musicTrackVolume = var3;
+		class20.musicTrackBoolean = var4;
+		class130.pcmSampleLength = 10000;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-1629524573"
+	)
+	public static void method1049(int var0, int var1) {
+		VarbitComposition var2 = WorldMapIcon_0.method3741(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;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(III)Z",
+		garbageValue = "742993017"
+	)
+	public static boolean method1050(int var0, int var1) {
+		return (var0 >> var1 + 1 & 1) != 0;
+	}
+
+	@ObfuscatedName("fk")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "84"
+	)
+	static final void method1038() {
+		if (Messages.field1275) {
+			for (int var0 = 0; var0 < Players.Players_count; ++var0) {
+				Player var1 = Client.players[Players.Players_indices[var0]];
+				var1.method2112();
+			}
+
+			Messages.field1275 = false;
+		}
+
+	}
+
+	@ObfuscatedName("kw")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1271900596"
+	)
+	static final void method1052() {
+		Client.field683 = Client.cycleCntr;
+	}
+
 	@ObfuscatedName("kr")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;B)V",
-		garbageValue = "-2"
+		descriptor = "(Ljd;B)I",
+		garbageValue = "89"
 	)
-	static final void method806(Widget var0) {
-		int var1 = var0.contentType;
-		if (var1 == 324) {
-			if (Client.field674 == -1) {
-				Client.field674 = var0.spriteId2;
-				Client.field675 = var0.spriteId;
-			}
-
-			if (Client.playerAppearance.isFemale) {
-				var0.spriteId2 = Client.field674;
-			} else {
-				var0.spriteId2 = Client.field675;
-			}
-
-		} else if (var1 == 325) {
-			if (Client.field674 == -1) {
-				Client.field674 = var0.spriteId2;
-				Client.field675 = var0.spriteId;
-			}
-
-			if (Client.playerAppearance.isFemale) {
-				var0.spriteId2 = Client.field675;
-			} else {
-				var0.spriteId2 = Client.field674;
-			}
-
-		} else if (var1 == 327) {
-			var0.modelAngleX = 150;
-			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
-			var0.modelType = 5;
-			var0.modelId = 0;
-		} else if (var1 == 328) {
-			var0.modelAngleX = 150;
-			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
-			var0.modelType = 5;
-			var0.modelId = 1;
-		}
+	@Export("getWidgetFlags")
+	static int getWidgetFlags(Widget var0) {
+		IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex);
+		return var1 != null ? var1.integer : var0.flags;
 	}
 }

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

@@ -4,29 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lk")
+@ObfuscatedName("mh")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Llk;"
+		descriptor = "Lmh;"
 	)
-	static final DefaultsGroup field3904;
-	@ObfuscatedName("lu")
+	static final DefaultsGroup field3999;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -694914585
-	)
-	@Export("menuY")
-	static int menuY;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 1809855359
+		intValue = -111517157
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3904 = new DefaultsGroup(3);
+		field3999 = 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("hk")
+@ObfuscatedName("hv")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lmc;"
+		descriptor = "Lnz;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lkc;"
+		descriptor = "Llz;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lhn;"
+		descriptor = "Lhx;"
 	)
-	class219 field2553;
+	class232 field2631;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -46,7 +46,7 @@ public final class DemotingHashTable {
 		this(var1, var1);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -77,16 +77,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lhu;)V"
+		descriptor = "(Lij;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -98,12 +98,12 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("j")
-	public void method4351(Object var1, long var2) {
+	@ObfuscatedName("k")
+	public void method4520(Object var1, long var2) {
 		this.put(var1, var2, 1);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
@@ -122,8 +122,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5);
-				if (this.field2553 != null) {
-					this.field2553.method4344(var5.get());
+				if (this.field2631 != null) {
+					this.field2631.method4499(var5.get());
 				}
 			}
 
@@ -134,7 +134,7 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
@@ -155,7 +155,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

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

@@ -4,38 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mj")
+@ObfuscatedName("nq")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("j")
+	@ObfuscatedName("mc")
 	@ObfuscatedGetter(
-		intValue = 592380753
+		intValue = -1111463299
 	)
-	int field3970;
-	@ObfuscatedName("l")
+	@Export("selectedItemSlot")
+	static int selectedItemSlot;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 497510611
+		intValue = -527617081
 	)
-	int field3971;
-	@ObfuscatedName("n")
+	int field4060;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 2127899029
+		intValue = 2074054305
 	)
-	int field3972;
+	int field4057;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 673460949
+	)
+	int field4062;
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lmz;",
-		garbageValue = "41"
+		descriptor = "(B)Lnh;",
+		garbageValue = "64"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (WorldMapEvent.formattedOperatingSystemName.startsWith("win")) {
+		if (class137.formattedOperatingSystemName.startsWith("win")) {
 			var1 = 1;
-		} else if (WorldMapEvent.formattedOperatingSystemName.startsWith("mac")) {
+		} else if (class137.formattedOperatingSystemName.startsWith("mac")) {
 			var1 = 2;
-		} else if (WorldMapEvent.formattedOperatingSystemName.startsWith("linux")) {
+		} else if (class137.formattedOperatingSystemName.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -133,10 +139,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6120(var5);
+		this.method6301(var5);
 		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1;
 		int var11;
-		if (this.field3970 > 3) {
+		if (this.field4060 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -150,55 +156,64 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3970, this.field3971, this.field3972, 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.field4060, this.field4057, this.field4062, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-180347683"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-81"
 	)
-	void method6120(String var1) {
+	void method6301(String var1) {
 		if (var1.startsWith("1.")) {
-			this.method6118(var1);
+			this.method6302(var1);
 		} else {
-			this.method6119(var1);
+			this.method6303(var1);
 		}
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-850545251"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "0"
 	)
-	void method6118(String var1) {
+	void method6302(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
-			this.field3970 = Integer.parseInt(var2[1]);
+			this.field4060 = Integer.parseInt(var2[1]);
 			var2 = var2[2].split("_");
-			this.field3971 = Integer.parseInt(var2[0]);
-			this.field3972 = Integer.parseInt(var2[1]);
+			this.field4057 = Integer.parseInt(var2[0]);
+			this.field4062 = Integer.parseInt(var2[1]);
 		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1756504457"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "7"
 	)
-	void method6119(String var1) {
+	void method6303(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
-			this.field3970 = Integer.parseInt(var2[0]);
-			this.field3971 = Integer.parseInt(var2[1]);
-			this.field3972 = Integer.parseInt(var2[2]);
+			this.field4060 = Integer.parseInt(var2[0]);
+			this.field4057 = Integer.parseInt(var2[1]);
+			this.field4062 = Integer.parseInt(var2[2]);
 		} catch (Exception var4) {
 		}
 
 	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lju;",
+		garbageValue = "-1639437305"
+	)
+	public static StudioGame[] method6307() {
+		return new StudioGame[]{StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.game5, StudioGame.game3, StudioGame.oldscape};
+	}
 }

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

@@ -9,43 +9,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("k")
+@ObfuscatedName("aq")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 616506629
+		intValue = -320464969
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1805977814"
+		descriptor = "(B)V",
+		garbageValue = "1"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)GrandExchangeOfferAgeComparator.field3633, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)class276.field3287, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
 		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "0"
+		garbageValue = "-111"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
@@ -56,8 +56,8 @@ public class DevicePcmPlayer extends PcmPlayer {
 			this.line.start();
 			this.capacity2 = var1;
 		} catch (LineUnavailableException var3) {
-			if (class124.method2535(var1) != 1) {
-				this.open(SoundSystem.method530(var1));
+			if (HealthBar.method2205(var1) != 1) {
+				this.open(ItemContainer.method2041(var1));
 			} else {
 				this.line = null;
 				throw var3;
@@ -65,17 +65,17 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "0"
+		garbageValue = "-10"
 	)
 	@Export("position")
 	protected int position() {
 		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
@@ -96,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "168869451"
+		descriptor = "(B)V",
+		garbageValue = "8"
 	)
 	@Export("close")
 	protected void close() {
@@ -110,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1574083924"
+		garbageValue = "-1022493238"
 	)
 	@Export("discard")
 	protected void discard() {

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

@@ -1,23 +1,33 @@
 import java.nio.ByteBuffer;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("is")
+@ObfuscatedName("jm")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1246567365
+	)
+	@Export("KitDefinition_fileCount")
+	public static int KitDefinition_fileCount;
 	@ObfuscatedName("e")
-	@Export("cacheSubPaths")
-	static String[] cacheSubPaths;
-	@ObfuscatedName("s")
+	@Export("Tiles_hue")
+	static int[] Tiles_hue;
+	@ObfuscatedName("n")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	@ObfuscatedName("v")
+	DirectByteArrayCopier() {
+	}
+
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "124"
+		descriptor = "(S)[B",
+		garbageValue = "147"
 	)
 	@Export("get")
 	byte[] get() {
@@ -27,15 +37,38 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "([BI)V",
-		garbageValue = "138258898"
+		descriptor = "([BS)V",
+		garbageValue = "2048"
 	)
 	@Export("set")
-	public void set(byte[] var1) {
+	void set(byte[] var1) {
 		this.directBuffer = ByteBuffer.allocateDirect(var1.length);
 		this.directBuffer.position(0);
 		this.directBuffer.put(var1);
 	}
+
+	@ObfuscatedName("im")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "641314973"
+	)
+	@Export("selectSpell")
+	static void selectSpell(int var0, int var1, int var2, int var3) {
+		Widget var4 = ParamComposition.getWidgetChild(var0, var1);
+		if (var4 != null && var4.onTargetEnter != null) {
+			ScriptEvent var5 = new ScriptEvent();
+			var5.widget = var4;
+			var5.args = var4.onTargetEnter;
+			class139.runScriptEvent(var5);
+		}
+
+		Client.field645 = var3;
+		Client.isSpellSelected = true;
+		WorldMapEvent.selectedSpellWidget = var0;
+		Client.selectedSpellChildIndex = var1;
+		ScriptFrame.selectedSpellFlags = var2;
+		Actor.invalidateWidget(var4);
+	}
 }

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("hz")
+@ObfuscatedName("ir")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@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("mw")
+@ObfuscatedName("mc")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cm")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cy")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmc;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cv")
+	@ObfuscatedName("cp")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmc;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cr")
+	@ObfuscatedName("dn")
 	@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("ks")
+@ObfuscatedName("kg")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmc;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)V"
+		descriptor = "(Lmc;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)V"
+		descriptor = "(Lmc;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmc;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -4,66 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bg")
+@ObfuscatedName("bo")
 @Implements("DynamicObject")
 public class DynamicObject extends Renderable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("io")
+	@ObfuscatedSignature(
+		descriptor = "[Loc;"
+	)
+	@Export("mapDotSprites")
+	static SpritePixels[] mapDotSprites;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1118110485
+		intValue = 5117713
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1905429005
+		intValue = -412707653
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1513156089
+		intValue = 482248501
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -548694859
+		intValue = 831891069
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2044490333
+		intValue = 1304906077
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -220951267
+		intValue = 445952397
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lfz;"
+		descriptor = "Lfa;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -116239835
+		intValue = -1173893765
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -763316459
+		intValue = 1768826999
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIZLgy;)V"
+		descriptor = "(IIIIIIIZLhr;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
 		this.id = var1;
@@ -73,10 +79,10 @@ public class DynamicObject extends Renderable {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = World.SequenceDefinition_get(var7);
+			this.sequenceDefinition = class17.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field1875 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field1961 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
 				if (var10.sequenceDefinition == this.sequenceDefinition) {
 					this.frame = var10.frame;
@@ -93,10 +99,10 @@ public class DynamicObject extends Renderable {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgl;",
-		garbageValue = "1291603774"
+		descriptor = "(B)Lhg;",
+		garbageValue = "18"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -106,11 +112,11 @@ public class DynamicObject extends Renderable {
 				var1 = 100;
 			}
 
-			label55: {
+			label56: {
 				do {
 					do {
 						if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-							break label55;
+							break label56;
 						}
 
 						var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -126,7 +132,7 @@ public class DynamicObject extends Renderable {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectComposition var12 = ClanChannel.getObjectDefinition(this.id);
+		ObjectComposition var12 = HitSplatDefinition.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -149,21 +155,72 @@ public class DynamicObject extends Renderable {
 			int var6 = (var3 >> 1) + this.y;
 			int var7 = (var3 + 1 >> 1) + this.y;
 			int[][] var8 = Tiles.Tiles_heights[this.plane];
-			int var9 = var8[var5][var6] + var8[var4][var6] + var8[var4][var7] + 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("v")
+	@ObfuscatedName("fs")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1405315336"
+		garbageValue = "-1870319643"
 	)
-	public static void method1727() {
-		class234.midiPcmStream.clear();
-		class234.musicPlayerStatus = 1;
-		class234.musicTrackArchive = null;
+	static void method1956() {
+		Client.packetWriter.clearBuffer();
+		Client.packetWriter.packetBuffer.offset = 0;
+		Client.packetWriter.serverPacket = null;
+		Client.packetWriter.field1288 = null;
+		Client.packetWriter.field1289 = null;
+		Client.packetWriter.field1290 = null;
+		Client.packetWriter.serverPacketLength = 0;
+		Client.packetWriter.field1279 = 0;
+		Client.rebootTimer = 0;
+		Client.menuOptionsCount = 0;
+		Client.isMenuOpen = false;
+		Client.minimapState = 0;
+		Client.destinationX = 0;
+
+		int var0;
+		for (var0 = 0; var0 < 2048; ++var0) {
+			Client.players[var0] = null;
+		}
+
+		class129.localPlayer = null;
+
+		for (var0 = 0; var0 < Client.npcs.length; ++var0) {
+			NPC var1 = Client.npcs[var0];
+			if (var1 != null) {
+				var1.targetIndex = -1;
+				var1.false0 = false;
+			}
+		}
+
+		CollisionMap.method3351();
+		HealthBarUpdate.updateGameState(30);
+
+		for (var0 = 0; var0 < 100; ++var0) {
+			Client.field697[var0] = true;
+		}
+
+		class280.method5087();
+	}
+
+	@ObfuscatedName("gk")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1479639989"
+	)
+	static void method1955() {
+		int var0 = Players.Players_count;
+		int[] var1 = Players.Players_indices;
+
+		for (int var2 = 0; var2 < var0; ++var2) {
+			if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) {
+				class114.addPlayerToScene(Client.players[var1[var2]], true);
+			}
+		}
+
 	}
 }

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

@@ -3,53 +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("eq")
+@ObfuscatedName("fg")
 @Implements("EnumComposition")
 public class EnumComposition extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
 	@Export("EnumDefinition_archive")
-	public static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("t")
+	static AbstractArchive EnumDefinition_archive;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("r")
-	@Export("musicTrackBoolean")
-	public static boolean musicTrackBoolean;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -2085329693
+		intValue = 1569829239
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1996066199
+		intValue = 1117713649
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -62,10 +60,10 @@ public class EnumComposition extends DualNode {
 		this.outputCount = 0;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;B)V",
-		garbageValue = "96"
+		descriptor = "(Lot;I)V",
+		garbageValue = "1678468441"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -79,10 +77,10 @@ public class EnumComposition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "-681077341"
+		descriptor = "(Lot;IB)V",
+		garbageValue = "3"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -119,13 +117,142 @@ public class EnumComposition extends DualNode {
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2004820017"
+		garbageValue = "1327387533"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount;
 	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(IZI)Ljava/lang/String;",
+		garbageValue = "1485411533"
+	)
+	@Export("intToString")
+	public static String intToString(int var0, boolean var1) {
+		if (var1 && var0 >= 0) {
+			int var3 = var0;
+			String var2;
+			if (var1 && var0 >= 0) {
+				int var4 = 2;
+
+				for (int var5 = var0 / 10; var5 != 0; ++var4) {
+					var5 /= 10;
+				}
+
+				char[] var6 = new char[var4];
+				var6[0] = '+';
+
+				for (int var7 = var4 - 1; var7 > 0; --var7) {
+					int var8 = var3;
+					var3 /= 10;
+					int var9 = var8 - var3 * 10;
+					if (var9 >= 10) {
+						var6[var7] = (char)(var9 + 87);
+					} else {
+						var6[var7] = (char)(var9 + 48);
+					}
+				}
+
+				var2 = new String(var6);
+			} else {
+				var2 = Integer.toString(var0, 10);
+			}
+
+			return var2;
+		} else {
+			return Integer.toString(var0);
+		}
+	}
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1969293465"
+	)
+	public static void method2940() {
+		NPCComposition.NpcDefinition_cached.clear();
+		NPCComposition.NpcDefinition_cachedModels.clear();
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "2"
+	)
+	static int method2941(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget;
+		if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollX;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollY;
+			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[++class240.Interpreter_intStackSize - 1] = var3.scrollWidth;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollHeight;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelZoom;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleX;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleZ;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleY;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETTRANS) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.transparencyTop;
+			return 1;
+		} else if (var0 == 1610) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.transparencyBot;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.color;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.color2;
+			return 1;
+		} else if (var0 == 1613) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
+			return 1;
+		} else if (var0 != 1615 && var0 != 1616) {
+			return 2;
+		} else {
+			++class240.Interpreter_intStackSize;
+			return 1;
+		}
+	}
+
+	@ObfuscatedName("ai")
+	@ObfuscatedSignature(
+		descriptor = "(ILbg;ZI)I",
+		garbageValue = "1392924736"
+	)
+	static int method2938(int var0, Script var1, boolean var2) {
+		if (var0 == 6900) {
+			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+			return 1;
+		} else if (var0 == 6950) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
 }

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

@@ -1,16 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kf")
-@Implements("Enumerated")
-public interface Enumerated {
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1806959663"
-	)
-	@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("hw")
+@ObfuscatedName("im")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lmw;"
-	)
-	DualNode field2559;
-	@ObfuscatedName("t")
-	@Export("capacity")
-	int capacity;
-	@ObfuscatedName("v")
-	@Export("remainingCapacity")
-	int remainingCapacity;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "Lmc;"
 	)
+	DualNode field2633;
+	@ObfuscatedName("c")
+	@Export("capacity")
+	int capacity;
+	@ObfuscatedName("m")
+	@Export("remainingCapacity")
+	int remainingCapacity;
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "Lnz;"
+	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lkc;"
+		descriptor = "Llz;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field2559 = new DualNode();
+		this.field2633 = 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("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lmw;"
+		descriptor = "(J)Lmc;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;J)V"
+		descriptor = "(Lmc;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.field2559) {
+			if (var4 == this.field2633) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field2559 = new DualNode();
+		this.field2633 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

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

@@ -4,29 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gf")
+@ObfuscatedName("hi")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("br")
-	@ObfuscatedSignature(
-		descriptor = "Lja;"
-	)
-	static GameBuild field2349;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1621904451
+		intValue = -401677395
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1108401493
+		intValue = 1245481
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -78767847
+		intValue = 1613056851
 	)
 	@Export("z")
 	int z;
@@ -34,39 +29,23 @@ public class FaceNormal {
 	FaceNormal() {
 	}
 
-	@ObfuscatedName("iw")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "([Lio;IIIZI)V",
-		garbageValue = "-1098219782"
+		descriptor = "(IS)Z",
+		garbageValue = "13608"
 	)
-	@Export("resizeInterface")
-	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
-		for (int var5 = 0; var5 < var0.length; ++var5) {
-			Widget var6 = var0[var5];
-			if (var6 != null && var6.parentId == var1) {
-				GrandExchangeOfferUnitPriceComparator.alignWidgetSize(var6, var2, var3, var4);
-				SoundCache.alignWidgetPosition(var6, var2, var3);
-				if (var6.scrollX > var6.scrollWidth - var6.width) {
-					var6.scrollX = var6.scrollWidth - var6.width;
-				}
-
-				if (var6.scrollX < 0) {
-					var6.scrollX = 0;
-				}
-
-				if (var6.scrollY > var6.scrollHeight - var6.height) {
-					var6.scrollY = var6.scrollHeight - var6.height;
-				}
-
-				if (var6.scrollY < 0) {
-					var6.scrollY = 0;
-				}
-
-				if (var6.type == 0) {
-					AttackOption.revalidateWidgetScroll(var0, var6, var4);
-				}
-			}
-		}
+	@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("l")
+	@ObfuscatedSignature(
+		descriptor = "(CI)Z",
+		garbageValue = "-1523765132"
+	)
+	@Export("isDigit")
+	public static boolean isDigit(char var0) {
+		return var0 >= '0' && var0 <= '9';
 	}
 }

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

@@ -2,125 +2,38 @@ import java.io.File;
 import java.util.Hashtable;
 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("el")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("FileSystem_hasPermissions")
-	static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("t")
+	public static boolean FileSystem_hasPermissions;
+	@ObfuscatedName("c")
 	@Export("FileSystem_cacheDir")
-	static File FileSystem_cacheDir;
-	@ObfuscatedName("v")
+	public static File FileSystem_cacheDir;
+	@ObfuscatedName("m")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "[Lof;"
-	)
-	@Export("title_muteSprite")
-	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = -321551563
-	)
-	static int field1484;
 
 	static {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("ki")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;III)[Lof;",
-		garbageValue = "-2007880048"
+		descriptor = "(Ljd;I)Ljava/lang/String;",
+		garbageValue = "-1778934467"
 	)
-	public static IndexedSprite[] method2628(AbstractArchive var0, int var1, int var2) {
-		if (!class290.method5208(var0, var1, var2)) {
+	@Export("Widget_getSpellActionName")
+	static String Widget_getSpellActionName(Widget var0) {
+		if (class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var0)) == 0) {
 			return null;
 		} else {
-			IndexedSprite[] var4 = new IndexedSprite[class398.SpriteBuffer_spriteCount];
-
-			for (int var5 = 0; var5 < class398.SpriteBuffer_spriteCount; ++var5) {
-				IndexedSprite var6 = var4[var5] = new IndexedSprite();
-				var6.width = class398.SpriteBuffer_spriteWidth;
-				var6.height = class398.SpriteBuffer_spriteHeight;
-				var6.xOffset = class398.SpriteBuffer_xOffsets[var5];
-				var6.yOffset = class398.SpriteBuffer_yOffsets[var5];
-				var6.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[var5];
-				var6.subHeight = class374.SpriteBuffer_spriteHeights[var5];
-				var6.palette = class118.SpriteBuffer_spritePalette;
-				var6.pixels = class398.SpriteBuffer_pixels[var5];
-			}
-
-			class398.SpriteBuffer_xOffsets = null;
-			class398.SpriteBuffer_yOffsets = null;
-			ClanChannelMember.SpriteBuffer_spriteWidths = null;
-			class374.SpriteBuffer_spriteHeights = null;
-			class118.SpriteBuffer_spritePalette = null;
-			class398.SpriteBuffer_pixels = null;
-			return var4;
-		}
-	}
-
-	@ObfuscatedName("ap")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "954710146"
-	)
-	static int method2621(int var0, Script var1, boolean var2) {
-		if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) {
-			if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) {
-				if (var0 != 7003 && var0 != 7013 && var0 != 7023) {
-					if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) {
-						if (var0 != 7008 && var0 != 7018 && var0 != 7028) {
-							if (var0 != 7031 && var0 != 7032) {
-								if (var0 == 7033) {
-									--class1.Interpreter_stringStackSize;
-									return 1;
-								} else if (var0 != 7036 && var0 != 7037) {
-									if (var0 == 7038) {
-										--Interpreter.Interpreter_intStackSize;
-										return 1;
-									} else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) {
-										return 2;
-									} else {
-										--Interpreter.Interpreter_intStackSize;
-										return 1;
-									}
-								} else {
-									Interpreter.Interpreter_intStackSize -= 2;
-									return 1;
-								}
-							} else {
-								--class1.Interpreter_stringStackSize;
-								--Interpreter.Interpreter_intStackSize;
-								return 1;
-							}
-						} else {
-							--Interpreter.Interpreter_intStackSize;
-							return 1;
-						}
-					} else {
-						Interpreter.Interpreter_intStackSize -= 2;
-						return 1;
-					}
-				} else {
-					Interpreter.Interpreter_intStackSize -= 2;
-					return 1;
-				}
-			} else {
-				Interpreter.Interpreter_intStackSize -= 3;
-				return 1;
-			}
-		} else {
-			Interpreter.Interpreter_intStackSize -= 5;
-			return 1;
+			return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null;
 		}
 	}
 }

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

@@ -1,53 +1,52 @@
-import net.runelite.mapping.*;
+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("ou")
+@ObfuscatedName("oh")
 @Implements("FillMode")
-public enum FillMode implements Enumerated {
-	@ObfuscatedName("s")
+public enum FillMode implements MouseWheel {
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lou;"
+		descriptor = "Loh;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lou;"
+		descriptor = "Loh;"
 	)
-	field4255(1, 1),
-	@ObfuscatedName("v")
+	field4352(1, 1),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lou;"
+		descriptor = "Loh;"
 	)
-	field4256(2, 2);
+	field4354(2, 2);
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -839032429
+		intValue = -477318771
 	)
-	static int field4259;
-	@ObfuscatedName("j")
+	public final int field4353;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 698833695
+		intValue = 439183323
 	)
-	public final int field4257;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -1768437689
-	)
-	final int field4258;
+	final int field4356;
 
 	FillMode(int var3, int var4) {
-		this.field4257 = var3;
-		this.field4258 = var4;
+		this.field4353 = var3;
+		this.field4356 = var4;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1806959663"
+		garbageValue = "-1665712539"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field4258;
+		return this.field4356;
 	}
 }

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("gn")
+@ObfuscatedName("gx")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1065761401
+		intValue = 2081652561
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -612034411
+		intValue = 744017517
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -768005843
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lgy;"
-	)
-	@Export("renderable")
-	public Renderable renderable;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		longValue = -8544200535771831587L
+		longValue = -381493142240489229L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("n")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -871159579
+		intValue = -2079626099
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lhr;"
+	)
+	@Export("renderable")
+	public Renderable renderable;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = -321570841
 	)
 	@Export("flags")
 	int flags;
@@ -47,99 +47,12 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	}
 
-	@ObfuscatedName("ft")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1217280037"
+		descriptor = "(Lot;I)Ljava/lang/String;",
+		garbageValue = "1701433854"
 	)
-	static final void method3877() {
-		for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
-			int var10002 = Client.queuedSoundEffectDelays[var0]--;
-			if (Client.queuedSoundEffectDelays[var0] >= -10) {
-				SoundEffect var1 = Client.soundEffects[var0];
-				if (var1 == null) {
-					Object var10000 = null;
-					var1 = SoundEffect.readSoundEffect(InvDefinition.archive4, Client.soundEffectIds[var0], 0);
-					if (var1 == null) {
-						continue;
-					}
-
-					int[] var13 = Client.queuedSoundEffectDelays;
-					var13[var0] += var1.calculateDelay();
-					Client.soundEffects[var0] = var1;
-				}
-
-				if (Client.queuedSoundEffectDelays[var0] < 0) {
-					int var2;
-					if (Client.soundLocations[var0] != 0) {
-						int var3 = (Client.soundLocations[var0] & 255) * 128;
-						int var4 = Client.soundLocations[var0] >> 16 & 255;
-						int var5 = var4 * 128 + 64 - MouseHandler.localPlayer.x;
-						if (var5 < 0) {
-							var5 = -var5;
-						}
-
-						int var6 = Client.soundLocations[var0] >> 8 & 255;
-						int var7 = var6 * 128 + 64 - MouseHandler.localPlayer.y;
-						if (var7 < 0) {
-							var7 = -var7;
-						}
-
-						int var8 = var7 + var5 - 128;
-						if (var8 > var3) {
-							Client.queuedSoundEffectDelays[var0] = -100;
-							continue;
-						}
-
-						if (var8 < 0) {
-							var8 = 0;
-						}
-
-						var2 = (var3 - var8) * Decimator.clientPreferences.areaSoundEffectsVolume / var3;
-					} else {
-						var2 = Decimator.clientPreferences.soundEffectsVolume;
-					}
-
-					if (var2 > 0) {
-						RawSound var9 = var1.toRawSound().resample(FloorOverlayDefinition.decimator);
-						RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2);
-						var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
-						TileItem.pcmStreamMixer.addSubStream(var10);
-					}
-
-					Client.queuedSoundEffectDelays[var0] = -100;
-				}
-			} else {
-				--Client.soundEffectCount;
-
-				for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) {
-					Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1];
-					Client.soundEffects[var11] = Client.soundEffects[var11 + 1];
-					Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1];
-					Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1];
-					Client.soundLocations[var11] = Client.soundLocations[var11 + 1];
-				}
-
-				--var0;
-			}
-		}
-
-		if (Client.field647) {
-			boolean var12;
-			if (class234.musicPlayerStatus != 0) {
-				var12 = true;
-			} else {
-				var12 = class234.midiPcmStream.isReady();
-			}
-
-			if (!var12) {
-				if (Decimator.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) {
-					Players.method2022(class108.archive6, Client.currentTrackGroupId, 0, Decimator.clientPreferences.musicVolume, false);
-				}
-
-				Client.field647 = false;
-			}
-		}
-
+	public static String method4029(Buffer var0) {
+		return FloorOverlayDefinition.method3263(var0, 32767);
 	}
 }

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

@@ -1,84 +1,88 @@
+import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fw")
+@ObfuscatedName("fx")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("rb")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lao;"
-	)
-	@Export("decimator")
-	static Decimator decimator;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("v")
+	@ObfuscatedName("w")
+	@Export("BZip2Decompressor_block")
+	static int[] BZip2Decompressor_block;
+	@ObfuscatedName("gw")
 	@ObfuscatedGetter(
-		intValue = 667316801
+		intValue = -195653107
+	)
+	@Export("baseX")
+	static int baseX;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1734986159
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1063696887
+		intValue = 718205849
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -2020856341
+		intValue = -888427239
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -707439719
+		intValue = -1569882159
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -605382025
+		intValue = 1328191101
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1441861703
+		intValue = -2098676613
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 450257925
+		intValue = 289005511
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 377708913
+		intValue = 1692859891
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1102913933
+		intValue = 1352572149
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -94,10 +98,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1241018196"
+		descriptor = "(B)V",
+		garbageValue = "61"
 	)
 	@Export("postDecode")
 	public void postDecode() {
@@ -111,10 +115,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;IB)V",
-		garbageValue = "81"
+		descriptor = "(Lot;II)V",
+		garbageValue = "-693305168"
 	)
 	@Export("decode")
 	public void decode(Buffer var1, int var2) {
@@ -128,10 +132,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;III)V",
-		garbageValue = "1340333905"
+		descriptor = "(Lot;III)V",
+		garbageValue = "985696118"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -148,10 +152,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1484541968"
+		garbageValue = "488331983"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -178,8 +182,8 @@ public class FloorOverlayDefinition extends DualNode {
 
 		double var12 = 0.0D;
 		double var14 = 0.0D;
-		double var16 = (var8 + var10) / 2.0D;
-		if (var8 != var10) {
+		double var16 = (var10 + var8) / 2.0D;
+		if (var10 != var8) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var10 + var8);
 			}
@@ -190,17 +194,17 @@ public class FloorOverlayDefinition extends DualNode {
 
 			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) {
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-			} else if (var10 == var6) {
+			} else if (var10 == var4) {
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+			} else if (var6 == var10) {
 				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
-		this.hue = (int)(256.0D * var12);
+		this.hue = (int)(var12 * 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) {
@@ -215,22 +219,54 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Loo;",
-		garbageValue = "-1435537454"
+		descriptor = "(CI)Z",
+		garbageValue = "-2130503048"
 	)
-	public static PrivateChatMode method3134(int var0) {
-		PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4297, PrivateChatMode.field4299, PrivateChatMode.field4298};
-		PrivateChatMode[] var2 = var1;
+	public static final boolean method3277(char var0) {
+		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
+	}
 
-		for (int var3 = 0; var3 < var2.length; ++var3) {
-			PrivateChatMode var4 = var2[var3];
-			if (var0 == var4.field4300) {
-				return var4;
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(Lot;IB)Ljava/lang/String;",
+		garbageValue = "-5"
+	)
+	static String method3263(Buffer var0, int var1) {
+		try {
+			int var2 = var0.readUShortSmart();
+			if (var2 > var1) {
+				var2 = var1;
 			}
-		}
 
-		return null;
+			byte[] var3 = new byte[var2];
+			var0.offset += class264.huffman.decompress(var0.array, var0.offset, var3, 0, var2);
+			String var4 = class128.decodeStringCp1252(var3, 0, var2);
+			return var4;
+		} catch (Exception var6) {
+			return "Cabbage";
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(B)Ljava/security/SecureRandom;",
+		garbageValue = "-101"
+	)
+	static SecureRandom method3272() {
+		SecureRandom var0 = new SecureRandom();
+		var0.nextInt();
+		return var0;
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)I",
+		garbageValue = "1733668396"
+	)
+	static final int method3270(int var0, int var1, int var2, int var3) {
+		int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1;
+		return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16);
 	}
 }

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

@@ -4,60 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("en")
+@ObfuscatedName("fv")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
-	public static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("t")
+	static AbstractArchive FloorUnderlayDefinition_archive;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
-	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("o")
+	static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
+	@ObfuscatedName("a")
+	static byte[][][] field1769;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -129692825
-	)
-	@Export("ItemDefinition_fileCount")
-	public static int ItemDefinition_fileCount;
-	@ObfuscatedName("ho")
-	@ObfuscatedSignature(
-		descriptor = "[Lom;"
-	)
-	@Export("mapMarkerSprites")
-	static SpritePixels[] mapMarkerSprites;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1396764945
+		intValue = -2135800243
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 295094139
+		intValue = 928932641
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1733330249
+		intValue = 1423685575
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 190827683
+		intValue = -1235823941
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -370135901
+		intValue = 1016584497
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -66,27 +56,27 @@ public class FloorUnderlayDefinition extends DualNode {
 		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	public FloorUnderlayDefinition() {
+	FloorUnderlayDefinition() {
 		this.rgb = 0;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "16761"
+		descriptor = "(I)V",
+		garbageValue = "1292783248"
 	)
 	@Export("postDecode")
-	public void postDecode() {
+	void postDecode() {
 		this.setHsl(this.rgb);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "187801207"
+		descriptor = "(Lot;II)V",
+		garbageValue = "625254252"
 	)
 	@Export("decode")
-	public void decode(Buffer var1, int var2) {
+	void decode(Buffer var1, int var2) {
 		while (true) {
 			int var3 = var1.readUnsignedByte();
 			if (var3 == 0) {
@@ -97,10 +87,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;III)V",
-		garbageValue = "645232357"
+		descriptor = "(Lot;III)V",
+		garbageValue = "1903251237"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -110,10 +100,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1318527639"
+		descriptor = "(IB)V",
+		garbageValue = "-78"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -141,7 +131,7 @@ public class FloorUnderlayDefinition extends DualNode {
 		double var12 = 0.0D;
 		double var14 = 0.0D;
 		double var16 = (var8 + var10) / 2.0D;
-		if (var8 != var10) {
+		if (var10 != var8) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var8 + var10);
 			}
@@ -153,15 +143,15 @@ public class FloorUnderlayDefinition extends DualNode {
 			if (var2 == var10) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var4 == var10) {
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
-			} else if (var6 == var10) {
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+			} else if (var10 == var6) {
 				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
 		this.saturation = (int)(var14 * 256.0D);
-		this.lightness = (int)(var16 * 256.0D);
+		this.lightness = (int)(256.0D * var16);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -175,9 +165,9 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 
 		if (var16 > 0.5D) {
-			this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D);
+			this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16));
 		} else {
-			this.hueMultiplier = (int)(var14 * var16 * 512.0D);
+			this.hueMultiplier = (int)(var16 * var14 * 512.0D);
 		}
 
 		if (this.hueMultiplier < 1) {
@@ -187,78 +177,34 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.hue = (int)(var12 * (double)this.hueMultiplier);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "385703346"
+		descriptor = "(II)Lpx;",
+		garbageValue = "-1201806222"
 	)
-	public static void method2892(boolean var0) {
-		if (var0 != class144.ItemDefinition_inMembersWorld) {
-			VarbitComposition.method2898();
-			class144.ItemDefinition_inMembersWorld = var0;
-		}
+	public static PrivateChatMode method3025(int var0) {
+		PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4392, PrivateChatMode.field4394, PrivateChatMode.field4395};
+		PrivateChatMode[] var2 = var1;
 
-	}
-
-	@ObfuscatedName("ix")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "544475904"
-	)
-	static void method2884(int var0, int var1) {
-		int var2 = TaskHandler.fontBold12.stringWidth("Choose Option");
-
-		int var3;
-		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) {
-			Font var7 = TaskHandler.fontBold12;
-			String var8;
-			if (var3 < 0) {
-				var8 = "";
-			} else if (Client.menuTargets[var3].length() > 0) {
-				var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3];
-			} else {
-				var8 = Client.menuActions[var3];
-			}
-
-			int var6 = var7.stringWidth(var8);
-			if (var6 > var2) {
-				var2 = var6;
+		for (int var3 = 0; var3 < var2.length; ++var3) {
+			PrivateChatMode var4 = var2[var3];
+			if (var0 == var4.field4393) {
+				return var4;
 			}
 		}
 
-		var2 += 8;
-		var3 = Client.menuOptionsCount * 15 + 22;
-		int var4 = var0 - var2 / 2;
-		if (var2 + var4 > MouseRecorder.canvasWidth) {
-			var4 = MouseRecorder.canvasWidth - var2;
-		}
-
-		if (var4 < 0) {
-			var4 = 0;
-		}
-
-		int var5 = var1;
-		if (var3 + var1 > Client.canvasHeight) {
-			var5 = Client.canvasHeight - var3;
-		}
-
-		if (var5 < 0) {
-			var5 = 0;
-		}
-
-		SpotAnimationDefinition.menuX = var4;
-		DefaultsGroup.menuY = var5;
-		DevicePcmPlayerProvider.menuWidth = var2;
-		GraphicsObject.menuHeight = Client.menuOptionsCount * 15 + 22;
+		return null;
 	}
 
-	@ObfuscatedName("lz")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;B)Z",
-		garbageValue = "-40"
+		descriptor = "([BI)[B",
+		garbageValue = "643546348"
 	)
-	@Export("isComponentHidden")
-	static boolean isComponentHidden(Widget var0) {
-		return var0.isHidden;
+	static byte[] method3026(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/Font.java

@@ -2,7 +2,7 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("kt")
+@ObfuscatedName("lu")
 @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("s")
+	@ObfuscatedName("n")
 	@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("t")
+	@ObfuscatedName("c")
 	@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

@@ -2,48 +2,47 @@ 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("mk")
+@ObfuscatedName("nu")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnu;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnu;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnu;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnu;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnu;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnu;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("name")
 	String name;
 
@@ -60,191 +59,12 @@ public class FontName {
 		this.name = var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "13"
+		descriptor = "(IIIB)I",
+		garbageValue = "-80"
 	)
-	public static void method6374(int var0) {
-		if (class234.musicPlayerStatus != 0) {
-			HorizontalAlignment.musicTrackVolume = var0;
-		} else {
-			class234.midiPcmStream.setPcmStreamVolume(var0);
-		}
-
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZS)I",
-		garbageValue = "3144"
-	)
-	static int method6376(int var0, Script var1, boolean var2) {
-		boolean var3 = true;
-		Widget var4;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var4 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			var3 = false;
-		} else {
-			var4 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget;
-		}
-
-		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[--class1.Interpreter_stringStackSize]);
-				return 1;
-			} else {
-				--class1.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 = ObjectSound.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[--class1.Interpreter_stringStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) {
-				var4.spellActionName = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) {
-				var4.actions = null;
-				return 1;
-			} else if (var0 == 1308) {
-				var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				return 1;
-			} else if (var0 == 1309) {
-				--Interpreter.Interpreter_intStackSize;
-				return 1;
-			} else {
-				int var7;
-				byte[] var8;
-				if (var0 != ScriptOpcodes.CC_SETOPKEY) {
-					byte var5;
-					if (var0 == ScriptOpcodes.CC_SETOPTKEY) {
-						Interpreter.Interpreter_intStackSize -= 2;
-						var5 = 10;
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]};
-						byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]};
-						ItemComposition.Widget_setKey(var4, var5, var8, var9);
-						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) {
-							WorldMapSectionType.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];
-						WorldMapSectionType.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) {
-							StructComposition.Widget_setKeyIgnoreHeld(var4, var11);
-							return 1;
-						} else {
-							throw new RuntimeException();
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) {
-						var5 = 10;
-						StructComposition.Widget_setKeyIgnoreHeld(var4, var5);
-						return 1;
-					} else {
-						return 2;
-					}
-				} else {
-					byte[] var10 = null;
-					var8 = 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) {
-							var10 = new byte[var7 / 2];
-							var8 = new byte[var7 / 2];
-
-							for (var7 -= 2; var7 >= 0; var7 -= 2) {
-								var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize];
-								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1];
-							}
-						}
-					} else {
-						Interpreter.Interpreter_intStackSize -= 2;
-						var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]};
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]};
-					}
-
-					var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1;
-					if (var7 >= 0 && var7 <= 9) {
-						ItemComposition.Widget_setKey(var4, var7, var10, var8);
-						return 1;
-					} else {
-						throw new RuntimeException();
-					}
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "1821361801"
-	)
-	static int method6375(int var0, Script var1, boolean var2) {
-		Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var3));
-			return 1;
-		} else if (var0 != ScriptOpcodes.IF_GETOP) {
-			if (var0 == ScriptOpcodes.IF_GETOPBASE) {
-				if (var3.dataText == null) {
-					Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.dataText;
-				}
-
-				return 1;
-			} else {
-				return 2;
-			}
-		} else {
-			int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			--var4;
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
-				Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.actions[var4];
-			} else {
-				Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1;
-		}
+	static int method6551(int var0, int var1, int var2) {
+		return var0 << 28 | var1 << 14 | var2;
 	}
 }

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

@@ -1,31 +1,37 @@
 import java.util.HashMap;
 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("mt")
+@ObfuscatedName("nd")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("s")
+	@ObfuscatedName("ic")
+	@ObfuscatedGetter(
+		intValue = -736853061
+	)
+	@Export("cameraYaw")
+	static int cameraYaw;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;Ljy;)V"
+		descriptor = "(Lkk;Lkk;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -33,10 +39,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "([Lmk;B)Ljava/util/HashMap;",
-		garbageValue = "43"
+		descriptor = "([Lnu;I)Ljava/util/HashMap;",
+		garbageValue = "337483472"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -48,7 +54,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = ServerPacket.method4425(this.spritesArchive, this.fontsArchive, var5.name, "");
+				Font var6 = Archive.method5150(this.spritesArchive, this.fontsArchive, var5.name, "");
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -59,203 +65,555 @@ public class Fonts {
 		return var2;
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("eg")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZB)I",
-		garbageValue = "0"
+		descriptor = "(I)V",
+		garbageValue = "1384356512"
 	)
-	static int method6367(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			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;
+	@Export("load")
+	static void load() {
+		int var14;
+		if (Client.titleLoadingStage == 0) {
+			CollisionMap.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
+
+			for (var14 = 0; var14 < 4; ++var14) {
+				Client.collisionMaps[var14] = new CollisionMap(104, 104);
 			}
 
-			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;
-			}
+			class113.sceneMinimapSprite = new SpritePixels(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) {
+			WorldMapRectangle.archive0 = class4.newArchive(0, false, true, true);
+			MenuAction.archive1 = class4.newArchive(1, false, true, true);
+			class115.archive2 = class4.newArchive(2, true, false, true);
+			class260.archive3 = class4.newArchive(3, false, true, true);
+			ReflectionCheck.archive4 = class4.newArchive(4, false, true, true);
+			ObjectComposition.archive5 = class4.newArchive(5, true, true, true);
+			class276.archive6 = class4.newArchive(6, true, true, true);
+			class135.archive7 = class4.newArchive(7, false, true, true);
+			World.archive8 = class4.newArchive(8, false, true, true);
+			VarcInt.archive9 = class4.newArchive(9, false, true, true);
+			MouseRecorder.archive10 = class4.newArchive(10, false, true, true);
+			class318.archive11 = class4.newArchive(11, false, true, true);
+			SecureRandomCallable.archive12 = class4.newArchive(12, false, true, true);
+			class391.archive13 = class4.newArchive(13, true, false, true);
+			ApproximateRouteStrategy.archive14 = class4.newArchive(14, false, true, true);
+			WorldMapSection0.archive15 = class4.newArchive(15, false, true, true);
+			class120.archive17 = class4.newArchive(17, true, true, true);
+			class120.archive18 = class4.newArchive(18, false, true, true);
+			Interpreter.archive19 = class4.newArchive(19, false, true, true);
+			class28.archive20 = class4.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 var33 = 0;
+			var14 = var33 + WorldMapRectangle.archive0.percentage() * 4 / 100;
+			var14 += MenuAction.archive1.percentage() * 4 / 100;
+			var14 += class115.archive2.percentage() * 2 / 100;
+			var14 += class260.archive3.percentage() * 2 / 100;
+			var14 += ReflectionCheck.archive4.percentage() * 6 / 100;
+			var14 += ObjectComposition.archive5.percentage() * 4 / 100;
+			var14 += class276.archive6.percentage() * 2 / 100;
+			var14 += class135.archive7.percentage() * 56 / 100;
+			var14 += World.archive8.percentage() * 2 / 100;
+			var14 += VarcInt.archive9.percentage() * 2 / 100;
+			var14 += MouseRecorder.archive10.percentage() * 2 / 100;
+			var14 += class318.archive11.percentage() * 2 / 100;
+			var14 += SecureRandomCallable.archive12.percentage() * 2 / 100;
+			var14 += class391.archive13.percentage() * 2 / 100;
+			var14 += ApproximateRouteStrategy.archive14.percentage() * 2 / 100;
+			var14 += WorldMapSection0.archive15.percentage() * 2 / 100;
+			var14 += Interpreter.archive19.percentage() / 100;
+			var14 += class120.archive18.percentage() / 100;
+			var14 += class28.archive20.percentage() / 100;
+			var14 += class120.archive17.method5108() && class120.archive17.isFullyLoaded() ? 1 : 0;
+			if (var14 != 100) {
+				if (var14 != 0) {
+					Login.Login_loadingText = "Checking for updates - " + var14 + "%";
+				}
 
-			Client.camFollowHeight = var3;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight;
-			return 1;
+				Login.Login_loadingPercent = 30;
+			} else {
+				class21.method323(WorldMapRectangle.archive0, "Animations");
+				class21.method323(MenuAction.archive1, "Skeletons");
+				class21.method323(ReflectionCheck.archive4, "Sound FX");
+				class21.method323(ObjectComposition.archive5, "Maps");
+				class21.method323(class276.archive6, "Music Tracks");
+				class21.method323(class135.archive7, "Models");
+				class21.method323(World.archive8, "Sprites");
+				class21.method323(class318.archive11, "Music Jingles");
+				class21.method323(ApproximateRouteStrategy.archive14, "Music Samples");
+				class21.method323(WorldMapSection0.archive15, "Music Patches");
+				class21.method323(Interpreter.archive19, "World Map");
+				class21.method323(class120.archive18, "World Map Geography");
+				class21.method323(class28.archive20, "World Map Ground");
+				WorldMapRegion.spriteIds = new GraphicsDefaults();
+				WorldMapRegion.spriteIds.decode(class120.archive17);
+				Login.Login_loadingText = "Loaded update list";
+				Login.Login_loadingPercent = 30;
+				Client.titleLoadingStage = 45;
+			}
 		} else {
-			return 2;
+			Archive var2;
+			Archive var17;
+			if (Client.titleLoadingStage == 45) {
+				boolean var32 = !Client.isLowDetail;
+				class276.field3287 = 22050;
+				PcmPlayer.PcmPlayer_stereo = var32;
+				PcmPlayer.field268 = 2;
+				MidiPcmStream var30 = new MidiPcmStream();
+				var30.method4628(9, 128);
+				UserComparator10.pcmPlayer0 = class114.method2487(GameEngine.taskHandler, 0, 22050);
+				UserComparator10.pcmPlayer0.setStream(var30);
+				var2 = WorldMapSection0.archive15;
+				Archive var31 = ApproximateRouteStrategy.archive14;
+				var17 = ReflectionCheck.archive4;
+				class247.musicPatchesArchive = var2;
+				class247.musicSamplesArchive = var31;
+				class247.soundEffectsArchive = var17;
+				class135.midiPcmStream = var30;
+				FriendsChat.pcmPlayer1 = class114.method2487(GameEngine.taskHandler, 1, 2048);
+				MusicPatchPcmStream.pcmStreamMixer = new PcmStreamMixer();
+				FriendsChat.pcmPlayer1.setStream(MusicPatchPcmStream.pcmStreamMixer);
+				Language.decimator = new Decimator(22050, class276.field3287);
+				Login.Login_loadingText = "Prepared sound engine";
+				Login.Login_loadingPercent = 35;
+				Client.titleLoadingStage = 50;
+				UrlRequest.WorldMapElement_fonts = new Fonts(World.archive8, class391.archive13);
+			} else {
+				int var15;
+				if (Client.titleLoadingStage == 50) {
+					FontName[] var21 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana11};
+					var15 = var21.length;
+					Fonts var23 = UrlRequest.WorldMapElement_fonts;
+					FontName[] var19 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana11};
+					Client.fontsMap = var23.createMap(var19);
+					if (Client.fontsMap.size() < var15) {
+						Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var15 + "%";
+						Login.Login_loadingPercent = 40;
+					} else {
+						class87.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
+						class129.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12);
+						class11.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12);
+						ParamComposition.platformInfo = Client.platformInfoProvider.get();
+						Login.Login_loadingText = "Loaded fonts";
+						Login.Login_loadingPercent = 40;
+						Client.titleLoadingStage = 60;
+					}
+				} else if (Client.titleLoadingStage == 60) {
+					var14 = class28.method408(MouseRecorder.archive10, World.archive8);
+					var15 = Login.field869.length + Login.field892.length;
+					if (var14 < var15) {
+						Login.Login_loadingText = "Loading title screen - " + var14 * 100 / var15 + "%";
+						Login.Login_loadingPercent = 50;
+					} else {
+						Login.Login_loadingText = "Loaded title screen";
+						Login.Login_loadingPercent = 50;
+						HealthBarUpdate.updateGameState(5);
+						Client.titleLoadingStage = 70;
+					}
+				} else if (Client.titleLoadingStage == 70) {
+					if (!class115.archive2.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading config - " + class115.archive2.loadPercent() + "%";
+						Login.Login_loadingPercent = 60;
+					} else {
+						Archive var20 = class115.archive2;
+						FloorOverlayDefinition.FloorOverlayDefinition_archive = var20;
+						WorldMapElement.method2827(class115.archive2);
+						PendingSpawn.method2121(class115.archive2, class135.archive7);
+						Archive var29 = class115.archive2;
+						var2 = class135.archive7;
+						boolean var25 = Client.isLowDetail;
+						ObjectComposition.ObjectDefinition_archive = var29;
+						ObjectComposition.ObjectDefinition_modelsArchive = var2;
+						ObjectComposition.ObjectDefinition_isLowDetail = var25;
+						var17 = class115.archive2;
+						Archive var24 = class135.archive7;
+						NPCComposition.NpcDefinition_archive = var17;
+						NPCComposition.NpcDefinition_modelArchive = var24;
+						class111.method2466(class115.archive2);
+						UserComparator10.method2444(class115.archive2, class135.archive7, Client.isMembersWorld, class87.fontPlain11);
+						class15.method210(class115.archive2, WorldMapRectangle.archive0, MenuAction.archive1);
+						WorldMapDecoration.method3802(class115.archive2, class135.archive7);
+						class128.method2632(class115.archive2);
+						Archive var26 = class115.archive2;
+						VarpDefinition.VarpDefinition_archive = var26;
+						VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16);
+						Archive var18 = class260.archive3;
+						Archive var28 = class135.archive7;
+						Archive var9 = World.archive8;
+						Archive var10 = class391.archive13;
+						Widget.Widget_archive = var18;
+						GrandExchangeOfferOwnWorldComparator.Widget_modelsArchive = var28;
+						class184.Widget_spritesArchive = var9;
+						class260.Widget_fontsArchive = var10;
+						class139.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][];
+						Widget.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()];
+						Archive var11 = class115.archive2;
+						InvDefinition.InvDefinition_archive = var11;
+						ScriptEvent.method2056(class115.archive2);
+						Archive var12 = class115.archive2;
+						VarcInt.VarcInt_archive = var12;
+						Archive var13 = class115.archive2;
+						JagexCache.ParamDefinition_archive = var13;
+						WorldMapLabelSize.field2011 = new class386(class16.field83, 54, class323.clientLanguage, class115.archive2);
+						class125.HitSplatDefinition_cachedSprites = new class386(class16.field83, 47, class323.clientLanguage, class115.archive2);
+						GrandExchangeEvent.varcs = new Varcs();
+						class140.method2710(class115.archive2, World.archive8, class391.archive13);
+						ModelData0.method4481(class115.archive2, World.archive8);
+						ItemContainer.method2025(class115.archive2, World.archive8);
+						Login.Login_loadingText = "Loaded config";
+						Login.Login_loadingPercent = 60;
+						Client.titleLoadingStage = 80;
+					}
+				} else if (Client.titleLoadingStage == 80) {
+					var14 = 0;
+					if (MouseHandler.compass == null) {
+						MouseHandler.compass = class258.SpriteBuffer_getSprite(World.archive8, WorldMapRegion.spriteIds.compass, 0);
+					} else {
+						++var14;
+					}
+
+					if (class15.redHintArrowSprite == null) {
+						class15.redHintArrowSprite = class258.SpriteBuffer_getSprite(World.archive8, WorldMapRegion.spriteIds.field4001, 0);
+					} else {
+						++var14;
+					}
+
+					IndexedSprite[] var1;
+					int var3;
+					boolean var4;
+					byte[] var5;
+					IndexedSprite[] var6;
+					int var7;
+					IndexedSprite var8;
+					if (GameEngine.mapSceneSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.mapScenes;
+						var5 = var2.takeFile(var3, 0);
+						if (var5 == null) {
+							var4 = false;
+						} else {
+							class28.SpriteBuffer_decode(var5);
+							var4 = true;
+						}
+
+						if (!var4) {
+							var1 = null;
+						} else {
+							var6 = new IndexedSprite[class413.SpriteBuffer_spriteCount];
+
+							for (var7 = 0; var7 < class413.SpriteBuffer_spriteCount; ++var7) {
+								var8 = var6[var7] = new IndexedSprite();
+								var8.width = class413.SpriteBuffer_spriteWidth;
+								var8.height = class413.SpriteBuffer_spriteHeight;
+								var8.xOffset = class413.SpriteBuffer_xOffsets[var7];
+								var8.yOffset = class413.SpriteBuffer_yOffsets[var7];
+								var8.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var7];
+								var8.subHeight = class413.SpriteBuffer_spriteHeights[var7];
+								var8.palette = ItemContainer.SpriteBuffer_spritePalette;
+								var8.pixels = class283.SpriteBuffer_pixels[var7];
+							}
+
+							class413.SpriteBuffer_xOffsets = null;
+							class413.SpriteBuffer_yOffsets = null;
+							InvDefinition.SpriteBuffer_spriteWidths = null;
+							class413.SpriteBuffer_spriteHeights = null;
+							ItemContainer.SpriteBuffer_spritePalette = null;
+							class283.SpriteBuffer_pixels = null;
+							var1 = var6;
+						}
+
+						GameEngine.mapSceneSprites = var1;
+					} else {
+						++var14;
+					}
+
+					SpritePixels[] var22;
+					if (MusicPatch.headIconPkSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.headIconsPk;
+						if (!VertexNormal.method4477(var2, var3, 0)) {
+							var22 = null;
+						} else {
+							var22 = class174.method3364();
+						}
+
+						MusicPatch.headIconPkSprites = var22;
+					} else {
+						++var14;
+					}
+
+					if (GraphicsObject.headIconPrayerSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4004;
+						if (!VertexNormal.method4477(var2, var3, 0)) {
+							var22 = null;
+						} else {
+							var22 = class174.method3364();
+						}
+
+						GraphicsObject.headIconPrayerSprites = var22;
+					} else {
+						++var14;
+					}
+
+					if (class7.headIconHintSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4003;
+						if (!VertexNormal.method4477(var2, var3, 0)) {
+							var22 = null;
+						} else {
+							var22 = class174.method3364();
+						}
+
+						class7.headIconHintSprites = var22;
+					} else {
+						++var14;
+					}
+
+					if (class13.mapMarkerSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4006;
+						if (!VertexNormal.method4477(var2, var3, 0)) {
+							var22 = null;
+						} else {
+							var22 = class174.method3364();
+						}
+
+						class13.mapMarkerSprites = var22;
+					} else {
+						++var14;
+					}
+
+					if (class13.crossSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4007;
+						if (!VertexNormal.method4477(var2, var3, 0)) {
+							var22 = null;
+						} else {
+							var22 = class174.method3364();
+						}
+
+						class13.crossSprites = var22;
+					} else {
+						++var14;
+					}
+
+					if (DynamicObject.mapDotSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4008;
+						if (!VertexNormal.method4477(var2, var3, 0)) {
+							var22 = null;
+						} else {
+							var22 = class174.method3364();
+						}
+
+						DynamicObject.mapDotSprites = var22;
+					} else {
+						++var14;
+					}
+
+					if (ArchiveLoader.scrollBarSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4009;
+						var5 = var2.takeFile(var3, 0);
+						if (var5 == null) {
+							var4 = false;
+						} else {
+							class28.SpriteBuffer_decode(var5);
+							var4 = true;
+						}
+
+						if (!var4) {
+							var1 = null;
+						} else {
+							var6 = new IndexedSprite[class413.SpriteBuffer_spriteCount];
+
+							for (var7 = 0; var7 < class413.SpriteBuffer_spriteCount; ++var7) {
+								var8 = var6[var7] = new IndexedSprite();
+								var8.width = class413.SpriteBuffer_spriteWidth;
+								var8.height = class413.SpriteBuffer_spriteHeight;
+								var8.xOffset = class413.SpriteBuffer_xOffsets[var7];
+								var8.yOffset = class413.SpriteBuffer_yOffsets[var7];
+								var8.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var7];
+								var8.subHeight = class413.SpriteBuffer_spriteHeights[var7];
+								var8.palette = ItemContainer.SpriteBuffer_spritePalette;
+								var8.pixels = class283.SpriteBuffer_pixels[var7];
+							}
+
+							class413.SpriteBuffer_xOffsets = null;
+							class413.SpriteBuffer_yOffsets = null;
+							InvDefinition.SpriteBuffer_spriteWidths = null;
+							class413.SpriteBuffer_spriteHeights = null;
+							ItemContainer.SpriteBuffer_spritePalette = null;
+							class283.SpriteBuffer_pixels = null;
+							var1 = var6;
+						}
+
+						ArchiveLoader.scrollBarSprites = var1;
+					} else {
+						++var14;
+					}
+
+					if (WorldMapIcon_1.modIconSprites == null) {
+						var2 = World.archive8;
+						var3 = WorldMapRegion.spriteIds.field4010;
+						var5 = var2.takeFile(var3, 0);
+						if (var5 == null) {
+							var4 = false;
+						} else {
+							class28.SpriteBuffer_decode(var5);
+							var4 = true;
+						}
+
+						if (!var4) {
+							var1 = null;
+						} else {
+							var6 = new IndexedSprite[class413.SpriteBuffer_spriteCount];
+
+							for (var7 = 0; var7 < class413.SpriteBuffer_spriteCount; ++var7) {
+								var8 = var6[var7] = new IndexedSprite();
+								var8.width = class413.SpriteBuffer_spriteWidth;
+								var8.height = class413.SpriteBuffer_spriteHeight;
+								var8.xOffset = class413.SpriteBuffer_xOffsets[var7];
+								var8.yOffset = class413.SpriteBuffer_yOffsets[var7];
+								var8.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var7];
+								var8.subHeight = class413.SpriteBuffer_spriteHeights[var7];
+								var8.palette = ItemContainer.SpriteBuffer_spritePalette;
+								var8.pixels = class283.SpriteBuffer_pixels[var7];
+							}
+
+							class413.SpriteBuffer_xOffsets = null;
+							class413.SpriteBuffer_yOffsets = null;
+							InvDefinition.SpriteBuffer_spriteWidths = null;
+							class413.SpriteBuffer_spriteHeights = null;
+							ItemContainer.SpriteBuffer_spritePalette = null;
+							class283.SpriteBuffer_pixels = null;
+							var1 = var6;
+						}
+
+						WorldMapIcon_1.modIconSprites = var1;
+					} else {
+						++var14;
+					}
+
+					if (var14 < 11) {
+						Login.Login_loadingText = "Loading sprites - " + var14 * 100 / 12 + "%";
+						Login.Login_loadingPercent = 70;
+					} else {
+						AbstractFont.AbstractFont_modIconSprites = WorldMapIcon_1.modIconSprites;
+						class15.redHintArrowSprite.normalize();
+						var15 = (int)(Math.random() * 21.0D) - 10;
+						int var16 = (int)(Math.random() * 21.0D) - 10;
+						var3 = (int)(Math.random() * 21.0D) - 10;
+						int var27 = (int)(Math.random() * 41.0D) - 20;
+						GameEngine.mapSceneSprites[0].shiftColors(var15 + var27, var27 + var16, var3 + var27);
+						Login.Login_loadingText = "Loaded sprites";
+						Login.Login_loadingPercent = 70;
+						Client.titleLoadingStage = 90;
+					}
+				} else if (Client.titleLoadingStage == 90) {
+					if (!VarcInt.archive9.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading textures - " + "0%";
+						Login.Login_loadingPercent = 90;
+					} else {
+						MusicPatch.textureProvider = new TextureProvider(VarcInt.archive9, World.archive8, 20, VarbitComposition.clientPreferences.field1193, Client.isLowDetail ? 64 : 128);
+						Rasterizer3D.Rasterizer3D_setTextureLoader(MusicPatch.textureProvider);
+						Rasterizer3D.Rasterizer3D_setBrightness(VarbitComposition.clientPreferences.field1193);
+						Client.titleLoadingStage = 100;
+					}
+				} else if (Client.titleLoadingStage == 100) {
+					var14 = MusicPatch.textureProvider.getLoadedPercentage();
+					if (var14 < 100) {
+						Login.Login_loadingText = "Loading textures - " + var14 + "%";
+						Login.Login_loadingPercent = 90;
+					} else {
+						Login.Login_loadingText = "Loaded textures";
+						Login.Login_loadingPercent = 90;
+						Client.titleLoadingStage = 110;
+					}
+				} else if (Client.titleLoadingStage == 110) {
+					class184.mouseRecorder = new MouseRecorder();
+					GameEngine.taskHandler.newThreadTask(class184.mouseRecorder, 10);
+					Login.Login_loadingText = "Loaded input handler";
+					Login.Login_loadingPercent = 92;
+					Client.titleLoadingStage = 120;
+				} else if (Client.titleLoadingStage == 120) {
+					if (!MouseRecorder.archive10.tryLoadFileByNames("huffman", "")) {
+						Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
+						Login.Login_loadingPercent = 94;
+					} else {
+						Huffman var0 = new Huffman(MouseRecorder.archive10.takeFileByNames("huffman", ""));
+						Huffman.method5007(var0);
+						Login.Login_loadingText = "Loaded wordpack";
+						Login.Login_loadingPercent = 94;
+						Client.titleLoadingStage = 130;
+					}
+				} else if (Client.titleLoadingStage == 130) {
+					if (!class260.archive3.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading interfaces - " + class260.archive3.loadPercent() * 4 / 5 + "%";
+						Login.Login_loadingPercent = 96;
+					} else if (!SecureRandomCallable.archive12.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading interfaces - " + (80 + SecureRandomCallable.archive12.loadPercent() / 6) + "%";
+						Login.Login_loadingPercent = 96;
+					} else if (!class391.archive13.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading interfaces - " + (96 + class391.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 (!Interpreter.archive19.tryLoadGroupByName(WorldMapCacheName.field2199.name)) {
+						Login.Login_loadingText = "Loading world map - " + Interpreter.archive19.groupLoadPercentByName(WorldMapCacheName.field2199.name) / 10 + "%";
+					} else {
+						if (class65.worldMap == null) {
+							class65.worldMap = new WorldMap();
+							class65.worldMap.init(Interpreter.archive19, class120.archive18, class28.archive20, class11.fontBold12, Client.fontsMap, GameEngine.mapSceneSprites);
+						}
+
+						Login.Login_loadingText = "Loaded world map";
+						Client.titleLoadingStage = 150;
+					}
+				} else if (Client.titleLoadingStage == 150) {
+					HealthBarUpdate.updateGameState(10);
+				}
+			}
 		}
 	}
 
-	@ObfuscatedName("ht")
+	@ObfuscatedName("kk")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "-662295851"
+		descriptor = "(IIIILoc;Lii;B)V",
+		garbageValue = "90"
 	)
-	@Export("drawObject")
-	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
-		long var5 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0, var1, var2);
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		int var14;
-		int var26;
-		if (var5 != 0L) {
-			var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5);
-			var8 = var7 >> 6 & 3;
-			var9 = var7 & 31;
-			var10 = var3;
-			boolean var12 = 0L != var5;
-			if (var12) {
-				boolean var13 = (int)(var5 >>> 16 & 1L) == 1;
-				var12 = !var13;
-			}
-
-			if (var12) {
-				var10 = var4;
-			}
-
-			int[] var19 = class376.sceneMinimapSprite.pixels;
-			var26 = var1 * 4 + (103 - var2) * 2048 + 24624;
-			var14 = class78.Entity_unpackID(var5);
-			ObjectComposition var15 = ClanChannel.getObjectDefinition(var14);
-			if (var15.mapSceneId != -1) {
-				IndexedSprite var16 = NetFileRequest.mapSceneSprites[var15.mapSceneId];
-				if (var16 != null) {
-					int var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
-					int var18 = (var15.sizeY * 4 - var16.subHeight) / 2;
-					var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48);
-				}
-			} else {
-				if (var9 == 0 || var9 == 2) {
-					if (var8 == 0) {
-						var19[var26] = var10;
-						var19[var26 + 512] = var10;
-						var19[var26 + 1024] = var10;
-						var19[var26 + 1536] = var10;
-					} else if (var8 == 1) {
-						var19[var26] = var10;
-						var19[var26 + 1] = var10;
-						var19[var26 + 2] = var10;
-						var19[var26 + 3] = var10;
-					} else if (var8 == 2) {
-						var19[var26 + 3] = var10;
-						var19[var26 + 512 + 3] = var10;
-						var19[var26 + 1024 + 3] = var10;
-						var19[var26 + 1536 + 3] = var10;
-					} else if (var8 == 3) {
-						var19[var26 + 1536] = var10;
-						var19[var26 + 1536 + 1] = var10;
-						var19[var26 + 1536 + 2] = var10;
-						var19[var26 + 1536 + 3] = var10;
-					}
-				}
-
-				if (var9 == 3) {
-					if (var8 == 0) {
-						var19[var26] = var10;
-					} else if (var8 == 1) {
-						var19[var26 + 3] = var10;
-					} else if (var8 == 2) {
-						var19[var26 + 1536 + 3] = var10;
-					} else if (var8 == 3) {
-						var19[var26 + 1536] = var10;
-					}
-				}
-
-				if (var9 == 2) {
-					if (var8 == 3) {
-						var19[var26] = var10;
-						var19[var26 + 512] = var10;
-						var19[var26 + 1024] = var10;
-						var19[var26 + 1536] = var10;
-					} else if (var8 == 0) {
-						var19[var26] = var10;
-						var19[var26 + 1] = var10;
-						var19[var26 + 2] = var10;
-						var19[var26 + 3] = var10;
-					} else if (var8 == 1) {
-						var19[var26 + 3] = var10;
-						var19[var26 + 512 + 3] = var10;
-						var19[var26 + 1024 + 3] = var10;
-						var19[var26 + 1536 + 3] = var10;
-					} else if (var8 == 2) {
-						var19[var26 + 1536] = var10;
-						var19[var26 + 1536 + 1] = var10;
-						var19[var26 + 1536 + 2] = var10;
-						var19[var26 + 1536 + 3] = var10;
-					}
-				}
-			}
-		}
-
-		var5 = WorldMapIcon_1.scene.getGameObjectTag(var0, var1, var2);
-		if (var5 != 0L) {
-			var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5);
-			var8 = var7 >> 6 & 3;
-			var9 = var7 & 31;
-			var10 = class78.Entity_unpackID(var5);
-			ObjectComposition var20 = ClanChannel.getObjectDefinition(var10);
-			if (var20.mapSceneId != -1) {
-				IndexedSprite var28 = NetFileRequest.mapSceneSprites[var20.mapSceneId];
-				if (var28 != null) {
-					var26 = (var20.sizeX * 4 - var28.subWidth) / 2;
-					var14 = (var20.sizeY * 4 - var28.subHeight) / 2;
-					var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48);
-				}
-			} else if (var9 == 9) {
-				int var25 = 15658734;
-				boolean var27 = 0L != var5;
-				if (var27) {
-					boolean var21 = (int)(var5 >>> 16 & 1L) == 1;
-					var27 = !var21;
-				}
-
-				if (var27) {
-					var25 = 15597568;
-				}
-
-				int[] var22 = class376.sceneMinimapSprite.pixels;
-				int var29 = var1 * 4 + (103 - var2) * 2048 + 24624;
-				if (var8 != 0 && var8 != 2) {
-					var22[var29] = var25;
-					var22[var29 + 1 + 512] = var25;
-					var22[var29 + 1024 + 2] = var25;
-					var22[var29 + 1536 + 3] = var25;
+	@Export("drawSpriteOnMinimap")
+	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels 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.method7281(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 {
-					var22[var29 + 1536] = var25;
-					var22[var29 + 1 + 1024] = var25;
-					var22[var29 + 512 + 2] = var25;
-					var22[var29 + 3] = var25;
+					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
 				}
+
 			}
 		}
-
-		var5 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var1, var2);
-		if (var5 != 0L) {
-			var7 = class78.Entity_unpackID(var5);
-			ObjectComposition var23 = ClanChannel.getObjectDefinition(var7);
-			if (var23.mapSceneId != -1) {
-				IndexedSprite var24 = NetFileRequest.mapSceneSprites[var23.mapSceneId];
-				if (var24 != null) {
-					var10 = (var23.sizeX * 4 - var24.subWidth) / 2;
-					int var11 = (var23.sizeY * 4 - var24.subHeight) / 2;
-					var24.drawAt(var1 * 4 + var10 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48);
-				}
-			}
-		}
-
 	}
 }

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

@@ -1,22 +1,26 @@
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
 
-@ObfuscatedName("ga")
+@ObfuscatedName("hd")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "[Lgp;"
+		descriptor = "[Lht;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;Ljy;IZ)V"
+		descriptor = "(Lkk;Lkk;IZ)V",
+		garbageValue = "0"
 	)
-	Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
+	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
 		NodeDeque var5 = new NodeDeque();
 		int var6 = var1.getGroupFileCount(var3);
 		this.frames = new Animation[var6];
@@ -35,13 +39,7 @@ public class Frames extends DualNode {
 			}
 
 			if (var10 == null) {
-				byte[] var13;
-				if (var4) {
-					var13 = var2.getFile(0, var11);
-				} else {
-					var13 = var2.getFile(var11, 0);
-				}
-
+				byte[] var13 = var2.getFile(var11, 0);
 				var10 = new Skeleton(var11, var13);
 				var5.addFirst(var10);
 			}
@@ -51,30 +49,137 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-13"
+		descriptor = "(II)Z",
+		garbageValue = "1867948304"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
 
-	@ObfuscatedName("t")
-	static boolean method4174(long var0) {
-		return class266.method4916(var0) == 2;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1581825393"
+	)
+	public static void method4334() {
+		WorldMapRegion.WorldMapRegion_cachedSprites.demote(5);
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1644626137"
+		descriptor = "(Lot;II)V",
+		garbageValue = "1326986168"
 	)
-	static void method4169(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var1 != null) {
-			var1.remove();
+	@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] = World.loadClassFromDescriptor(var8[var12]);
+						}
+
+						Class var22 = World.loadClassFromDescriptor(var20);
+						if (World.loadClassFromDescriptor(var5).getClassLoader() == null) {
+							throw new SecurityException();
+						}
+
+						Method[] var13 = World.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 (var21[var19] != var17[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 (World.loadClassFromDescriptor(var5).getClassLoader() == null) {
+						throw new SecurityException();
+					}
+
+					var2.fields[var3] = Reflection.findField(World.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;
+			}
 		}
+
+		class54.reflectionChecks.addFirst(var2);
 	}
 }

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

@@ -2,22 +2,23 @@ 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("lb")
+@ObfuscatedName("la")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("s")
-	boolean field3842;
-	@ObfuscatedName("t")
-	boolean field3841;
+	@ObfuscatedName("n")
+	boolean field3936;
+	@ObfuscatedName("c")
+	boolean field3937;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Llb;B)I",
-		garbageValue = "-121"
+		descriptor = "(Lla;I)I",
+		garbageValue = "1061817546"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -29,23 +30,23 @@ public class Friend extends Buddy {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3842 && !var1.field3842) {
+		} else if (this.field3936 && !var1.field3936) {
 			return -1;
-		} else if (!this.field3842 && var1.field3842) {
+		} else if (!this.field3936 && var1.field3936) {
 			return 1;
-		} else if (this.field3841 && !var1.field3841) {
+		} else if (this.field3937 && !var1.field3937) {
 			return -1;
-		} else if (!this.field3841 && var1.field3841) {
+		} else if (!this.field3937 && var1.field3937) {
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Llm;I)I",
-		garbageValue = "2074675333"
+		descriptor = "(Lle;I)I",
+		garbageValue = "-1041307648"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -55,4 +56,120 @@ public class Friend extends Buddy {
 	public int compareTo(Object var1) {
 		return this.compareToFriend((Friend)var1);
 	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-1747450791"
+	)
+	static final int method5915(int var0, int var1, int var2) {
+		int var3 = var0 / var2;
+		int var4 = var0 & var2 - 1;
+		int var5 = var1 / var2;
+		int var6 = var1 & var2 - 1;
+		int var7 = class29.method422(var3, var5);
+		int var8 = class29.method422(var3 + 1, var5);
+		int var9 = class29.method422(var3, var5 + 1);
+		int var10 = class29.method422(var3 + 1, var5 + 1);
+		int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1;
+		int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16);
+		int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1;
+		int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16);
+		return FloorOverlayDefinition.method3270(var11, var13, var6, var2);
+	}
+
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "(ILbg;ZI)I",
+		garbageValue = "-482644124"
+	)
+	static int method5916(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
+			class240.Interpreter_intStackSize -= 2;
+			Client.field723 = (short)Client.method1609(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]);
+			if (Client.field723 <= 0) {
+				Client.field723 = 256;
+			}
+
+			Client.field742 = (short)Client.method1609(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]);
+			if (Client.field742 <= 0) {
+				Client.field742 = 256;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
+			class240.Interpreter_intStackSize -= 2;
+			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize];
+			if (Client.zoomHeight <= 0) {
+				Client.zoomHeight = 256;
+			}
+
+			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1];
+			if (Client.zoomWidth <= 0) {
+				Client.zoomWidth = 320;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
+			class240.Interpreter_intStackSize -= 4;
+			Client.field642 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize];
+			if (Client.field642 <= 0) {
+				Client.field642 = 1;
+			}
+
+			Client.field746 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1];
+			if (Client.field746 <= 0) {
+				Client.field746 = 32767;
+			} else if (Client.field746 < Client.field642) {
+				Client.field746 = Client.field642;
+			}
+
+			Client.field711 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2];
+			if (Client.field711 <= 0) {
+				Client.field711 = 1;
+			}
+
+			Client.field748 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3];
+			if (Client.field748 <= 0) {
+				Client.field748 = 32767;
+			} else if (Client.field748 < Client.field711) {
+				Client.field748 = Client.field711;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
+			if (Client.viewportWidget != null) {
+				class9.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.viewportWidth;
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.viewportHeight;
+			} else {
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.zoomHeight;
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.zoomWidth;
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = MusicPatchNode.method4849(Client.field723);
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = MusicPatchNode.method4849(Client.field742);
+			return 1;
+		} else if (var0 == 6220) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6221) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6222) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth;
+			return 1;
+		} else if (var0 == 6223) {
+			Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = GameEngine.canvasHeight;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
 }

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

@@ -4,84 +4,621 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lc")
+@ObfuscatedName("lx")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("qo")
-	@ObfuscatedSignature(
-		descriptor = "Ldt;"
-	)
-	@Export("guestClanChannel")
-	static ClanChannel guestClanChannel;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 874951947
+		intValue = 1383346713
 	)
-	public int field3846;
-	@ObfuscatedName("t")
+	public int field3943;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
+		descriptor = "Lpp;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		descriptor = "(Loh;I)V"
+		descriptor = "(Lpp;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3846 = (int)(UrlRequester.method2125() / 1000L);
+		this.field3943 = (int)(Occluder.method4335() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("ja")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;II)V",
-		garbageValue = "-1608246392"
+		descriptor = "([Ljd;IIIIIIII)V",
+		garbageValue = "1659556559"
 	)
-	static final void method5763(String var0, int var1) {
-		PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher);
-		var2.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0) + 1);
-		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
-		var2.packetBuffer.writeByte(var1);
-		Client.packetWriter.addNode(var2);
-	}
+	@Export("updateInterface")
+	static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		for (int var8 = 0; var8 < var0.length; ++var8) {
+			Widget var9 = var0[var8];
+			if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || Decimator.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
+				if (var9.isIf3) {
+					if (PcmPlayer.isComponentHidden(var9)) {
+						continue;
+					}
+				} else if (var9.type == 0 && var9 != class301.mousedOverWidgetIf1 && PcmPlayer.isComponentHidden(var9)) {
+					continue;
+				}
 
-	@ObfuscatedName("ho")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-2018320104"
-	)
-	@Export("worldToScreen")
-	static final void worldToScreen(int var0, int var1, int var2) {
-		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
-			int var3 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - var2;
-			var0 -= ItemContainer.cameraX;
-			var3 -= Bounds.cameraY;
-			var1 -= WorldMapArchiveLoader.cameraZ;
-			int var4 = Rasterizer3D.Rasterizer3D_sine[class116.cameraPitch];
-			int var5 = Rasterizer3D.Rasterizer3D_cosine[class116.cameraPitch];
-			int var6 = Rasterizer3D.Rasterizer3D_sine[class117.cameraYaw];
-			int var7 = Rasterizer3D.Rasterizer3D_cosine[class117.cameraYaw];
-			int var8 = var6 * var1 + var0 * var7 >> 16;
-			var1 = var7 * var1 - var0 * var6 >> 16;
-			var0 = var8;
-			var8 = var3 * var5 - var4 * var1 >> 16;
-			var1 = var3 * var4 + var5 * var1 >> 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;
+				int var10 = var9.x + var6;
+				int var11 = var7 + var9.y;
+				int var12;
+				int var13;
+				int var14;
+				int var15;
+				int var17;
+				int var18;
+				if (var9.type == 2) {
+					var12 = var2;
+					var13 = var3;
+					var14 = var4;
+					var15 = var5;
+				} else {
+					int var16;
+					if (var9.type == 9) {
+						var16 = var10;
+						var17 = var11;
+						var18 = var10 + var9.width;
+						int var19 = var11 + var9.height;
+						if (var18 < var10) {
+							var16 = var18;
+							var18 = var10;
+						}
+
+						if (var19 < var11) {
+							var17 = var19;
+							var19 = var11;
+						}
+
+						++var18;
+						++var19;
+						var12 = var16 > var2 ? var16 : var2;
+						var13 = var17 > var3 ? var17 : var3;
+						var14 = var18 < var4 ? var18 : var4;
+						var15 = var19 < var5 ? var19 : var5;
+					} else {
+						var16 = var10 + var9.width;
+						var17 = var11 + var9.height;
+						var12 = var10 > var2 ? var10 : var2;
+						var13 = var11 > var3 ? var11 : var3;
+						var14 = var16 < var4 ? var16 : var4;
+						var15 = var17 < var5 ? var17 : var5;
+					}
+				}
+
+				if (var9 == Client.clickedWidget) {
+					Client.field669 = true;
+					Client.field739 = var10;
+					Client.field671 = var11;
+				}
+
+				boolean var33 = false;
+				if (var9.field3119) {
+					switch(Client.field650) {
+					case 0:
+						var33 = true;
+					case 1:
+					default:
+						break;
+					case 2:
+						if (Client.field543 == var9.id >>> 16) {
+							var33 = true;
+						}
+						break;
+					case 3:
+						if (var9.id == Client.field543) {
+							var33 = true;
+						}
+					}
+				}
+
+				if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) {
+					if (var9.isIf3) {
+						ScriptEvent var26;
+						if (var9.noClickThrough) {
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
+									if (var26.isMouseInputEvent) {
+										var26.remove();
+										var26.widget.containsMouse = false;
+									}
+								}
+
+								if (class125.widgetDragDuration == 0) {
+									Client.clickedWidget = null;
+									Client.clickedWidgetParent = null;
+								}
+
+								if (!Client.isMenuOpen) {
+									Canvas.addCancelMenuEntry();
+								}
+							}
+						} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+							for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
+								if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) {
+									var26.remove();
+								}
+							}
+						}
+					}
+
+					var17 = MouseHandler.MouseHandler_x;
+					var18 = MouseHandler.MouseHandler_y;
+					if (MouseHandler.MouseHandler_lastButton != 0) {
+						var17 = MouseHandler.MouseHandler_lastPressedX;
+						var18 = MouseHandler.MouseHandler_lastPressedY;
+					}
+
+					boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15;
+					if (var9.contentType == 1337) {
+						if (!Client.isLoading && !Client.isMenuOpen && var34) {
+							class28.addSceneMenuOptions(var17, var18, var12, var13);
+						}
+					} else if (var9.contentType == 1338) {
+						BuddyRankComparator.checkIfMinimapClicked(var9, var10, var11);
+					} else {
+						if (var9.contentType == 1400) {
+							class65.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height);
+						}
+
+						if (!Client.isMenuOpen && var34) {
+							if (var9.contentType == 1400) {
+								class65.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18);
+							} else {
+								MilliClock.Widget_addToMenu(var9, var17 - var10, var18 - var11);
+							}
+						}
+
+						boolean var21;
+						int var23;
+						if (var33) {
+							for (int var20 = 0; var20 < var9.field3100.length; ++var20) {
+								var21 = false;
+								boolean var27 = false;
+								if (!var21 && var9.field3100[var20] != null) {
+									for (var23 = 0; var23 < var9.field3100[var20].length; ++var23) {
+										boolean var24 = false;
+										if (var9.field3188 != null) {
+											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3100[var20][var23]];
+										}
+
+										if (ItemComposition.method3191(var9.field3100[var20][var23]) || var24) {
+											var21 = true;
+											if (var9.field3188 != null && var9.field3188[var20] > Client.cycle) {
+												break;
+											}
+
+											byte var32 = var9.field3121[var20][var23];
+											if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
+												var27 = true;
+												break;
+											}
+										}
+									}
+								}
+
+								if (var27) {
+									if (var20 < 10) {
+										MouseHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
+									} else if (var20 == 10) {
+										ReflectionCheck.Widget_runOnTargetLeave();
+										DirectByteArrayCopier.selectSpell(var9.id, var9.childIndex, class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var9)), var9.itemId);
+										Client.selectedSpellActionName = FileSystem.Widget_getSpellActionName(var9);
+										if (Client.selectedSpellActionName == null) {
+											Client.selectedSpellActionName = "null";
+										}
+
+										Client.selectedSpellName = var9.dataText + class54.colorStartTag(16777215);
+									}
+
+									var23 = var9.field3135[var20];
+									if (var9.field3188 == null) {
+										var9.field3188 = new int[var9.field3100.length];
+									}
+
+									if (var9.field3123 == null) {
+										var9.field3123 = new int[var9.field3100.length];
+									}
+
+									if (var23 != 0) {
+										if (var9.field3188[var20] == 0) {
+											var9.field3188[var20] = var23 + Client.cycle + var9.field3123[var20];
+										} else {
+											var9.field3188[var20] = var23 + Client.cycle;
+										}
+									} else {
+										var9.field3188[var20] = Integer.MAX_VALUE;
+									}
+								}
+
+								if (!var21 && var9.field3188 != null) {
+									var9.field3188[var20] = 0;
+								}
+							}
+						}
+
+						if (var9.isIf3) {
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								var34 = true;
+							} else {
+								var34 = false;
+							}
+
+							boolean var35 = false;
+							if ((MouseHandler.MouseHandler_currentButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) {
+								var35 = true;
+							}
+
+							var21 = false;
+							if ((MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
+								var21 = true;
+							}
+
+							if (var21) {
+								Canvas.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
+							}
+
+							if (var9.contentType == 1400) {
+								class65.worldMap.method6365(var17, var18, var34 & var35, var34 & var21);
+							}
+
+							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class28.method402(Decimator.getWidgetFlags(var9))) {
+								Client.draggedOnWidget = var9;
+							}
+
+							if (var9 == Client.clickedWidgetParent) {
+								Client.field666 = true;
+								Client.field623 = var10;
+								Client.field658 = var11;
+							}
+
+							if (var9.hasListener) {
+								ScriptEvent var22;
+								if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
+									var22 = new ScriptEvent();
+									var22.isMouseInputEvent = true;
+									var22.widget = var9;
+									var22.mouseY = Client.mouseWheelRotation;
+									var22.args = var9.onScroll;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.clickedWidget != null || Decimator.dragInventoryWidget != null || Client.isMenuOpen) {
+									var21 = false;
+									var35 = false;
+									var34 = false;
+								}
+
+								if (!var9.isClicked && var21) {
+									var9.isClicked = true;
+									if (var9.onClick != null) {
+										var22 = new ScriptEvent();
+										var22.isMouseInputEvent = true;
+										var22.widget = var9;
+										var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
+										var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
+										var22.args = var9.onClick;
+										Client.scriptEvents.addFirst(var22);
+									}
+								}
+
+								if (var9.isClicked && var35 && var9.onClickRepeat != null) {
+									var22 = new ScriptEvent();
+									var22.isMouseInputEvent = true;
+									var22.widget = var9;
+									var22.mouseX = MouseHandler.MouseHandler_x - var10;
+									var22.mouseY = MouseHandler.MouseHandler_y - var11;
+									var22.args = var9.onClickRepeat;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (var9.isClicked && !var35) {
+									var9.isClicked = false;
+									if (var9.onRelease != null) {
+										var22 = new ScriptEvent();
+										var22.isMouseInputEvent = true;
+										var22.widget = var9;
+										var22.mouseX = MouseHandler.MouseHandler_x - var10;
+										var22.mouseY = MouseHandler.MouseHandler_y - var11;
+										var22.args = var9.onRelease;
+										Client.field693.addFirst(var22);
+									}
+								}
+
+								if (var35 && var9.onHold != null) {
+									var22 = new ScriptEvent();
+									var22.isMouseInputEvent = true;
+									var22.widget = var9;
+									var22.mouseX = MouseHandler.MouseHandler_x - var10;
+									var22.mouseY = MouseHandler.MouseHandler_y - var11;
+									var22.args = var9.onHold;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (!var9.containsMouse && var34) {
+									var9.containsMouse = true;
+									if (var9.onMouseOver != null) {
+										var22 = new ScriptEvent();
+										var22.isMouseInputEvent = true;
+										var22.widget = var9;
+										var22.mouseX = MouseHandler.MouseHandler_x - var10;
+										var22.mouseY = MouseHandler.MouseHandler_y - var11;
+										var22.args = var9.onMouseOver;
+										Client.scriptEvents.addFirst(var22);
+									}
+								}
+
+								if (var9.containsMouse && var34 && var9.onMouseRepeat != null) {
+									var22 = new ScriptEvent();
+									var22.isMouseInputEvent = true;
+									var22.widget = var9;
+									var22.mouseX = MouseHandler.MouseHandler_x - var10;
+									var22.mouseY = MouseHandler.MouseHandler_y - var11;
+									var22.args = var9.onMouseRepeat;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (var9.containsMouse && !var34) {
+									var9.containsMouse = false;
+									if (var9.onMouseLeave != null) {
+										var22 = new ScriptEvent();
+										var22.isMouseInputEvent = true;
+										var22.widget = var9;
+										var22.mouseX = MouseHandler.MouseHandler_x - var10;
+										var22.mouseY = MouseHandler.MouseHandler_y - var11;
+										var22.args = var9.onMouseLeave;
+										Client.field693.addFirst(var22);
+									}
+								}
+
+								if (var9.onTimer != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.onTimer;
+									Client.field745.addFirst(var22);
+								}
+
+								ScriptEvent var25;
+								int var36;
+								int var37;
+								if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3183) {
+									if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3183 <= 32) {
+										label810:
+										for (var37 = var9.field3183; var37 < Client.changedVarpCount; ++var37) {
+											var23 = Client.changedVarps[var37 & 31];
+
+											for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
+												if (var23 == var9.varTransmitTriggers[var36]) {
+													var25 = new ScriptEvent();
+													var25.widget = var9;
+													var25.args = var9.onVarTransmit;
+													Client.scriptEvents.addFirst(var25);
+													break label810;
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent();
+										var22.widget = var9;
+										var22.args = var9.onVarTransmit;
+										Client.scriptEvents.addFirst(var22);
+									}
+
+									var9.field3183 = Client.changedVarpCount;
+								}
+
+								if (var9.onInvTransmit != null && Client.field677 > var9.field3184) {
+									if (var9.invTransmitTriggers != null && Client.field677 - var9.field3184 <= 32) {
+										label786:
+										for (var37 = var9.field3184; var37 < Client.field677; ++var37) {
+											var23 = Client.changedItemContainers[var37 & 31];
+
+											for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
+												if (var23 == var9.invTransmitTriggers[var36]) {
+													var25 = new ScriptEvent();
+													var25.widget = var9;
+													var25.args = var9.onInvTransmit;
+													Client.scriptEvents.addFirst(var25);
+													break label786;
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent();
+										var22.widget = var9;
+										var22.args = var9.onInvTransmit;
+										Client.scriptEvents.addFirst(var22);
+									}
+
+									var9.field3184 = Client.field677;
+								}
+
+								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3122) {
+									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3122 <= 32) {
+										label762:
+										for (var37 = var9.field3122; var37 < Client.changedSkillsCount; ++var37) {
+											var23 = Client.changedSkills[var37 & 31];
+
+											for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
+												if (var23 == var9.statTransmitTriggers[var36]) {
+													var25 = new ScriptEvent();
+													var25.widget = var9;
+													var25.args = var9.onStatTransmit;
+													Client.scriptEvents.addFirst(var25);
+													break label762;
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent();
+										var22.widget = var9;
+										var22.args = var9.onStatTransmit;
+										Client.scriptEvents.addFirst(var22);
+									}
+
+									var9.field3122 = Client.changedSkillsCount;
+								}
+
+								if (Client.chatCycle > var9.field3182 && var9.onChatTransmit != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.onChatTransmit;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field683 > var9.field3182 && var9.onFriendTransmit != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.onFriendTransmit;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field630 > var9.field3182 && var9.onClanTransmit != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.onClanTransmit;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field664 > var9.field3182 && var9.field3159 != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.field3159;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field672 > var9.field3182 && var9.field3160 != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.field3160;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field703 > var9.field3182 && var9.onStockTransmit != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.onStockTransmit;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field688 > var9.field3182 && var9.field3174 != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.field3174;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								if (Client.field695 > var9.field3182 && var9.onMiscTransmit != null) {
+									var22 = new ScriptEvent();
+									var22.widget = var9;
+									var22.args = var9.onMiscTransmit;
+									Client.scriptEvents.addFirst(var22);
+								}
+
+								var9.field3182 = Client.cycleCntr;
+								if (var9.onKey != null) {
+									for (var37 = 0; var37 < Client.field713; ++var37) {
+										ScriptEvent var31 = new ScriptEvent();
+										var31.widget = var9;
+										var31.keyTyped = Client.field595[var37];
+										var31.keyPressed = Client.field714[var37];
+										var31.args = var9.onKey;
+										Client.scriptEvents.addFirst(var31);
+									}
+								}
+
+								ScriptEvent var30;
+								int[] var38;
+								if (var9.field3155 != null) {
+									var38 = GrandExchangeOfferWorldComparator.method5320();
+
+									for (var23 = 0; var23 < var38.length; ++var23) {
+										var30 = new ScriptEvent();
+										var30.widget = var9;
+										var30.keyTyped = var38[var23];
+										var30.args = var9.field3155;
+										Client.scriptEvents.addFirst(var30);
+									}
+								}
+
+								if (var9.field3069 != null) {
+									var38 = class351.method6227();
+
+									for (var23 = 0; var23 < var38.length; ++var23) {
+										var30 = new ScriptEvent();
+										var30.widget = var9;
+										var30.keyTyped = var38[var23];
+										var30.args = var9.field3069;
+										Client.scriptEvents.addFirst(var30);
+									}
+								}
+							}
+						}
+
+						if (!var9.isIf3) {
+							if (Client.clickedWidget != null || Decimator.dragInventoryWidget != null || Client.isMenuOpen) {
+								continue;
+							}
+
+							if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								if (var9.mouseOverRedirect >= 0) {
+									class301.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+								} else {
+									class301.mousedOverWidgetIf1 = var9;
+								}
+							}
+
+							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								BufferedFile.field4227 = var9;
+							}
+
+							if (var9.scrollHeight > var9.height) {
+								class150.method2805(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+							}
+						}
+
+						if (var9.type == 0) {
+							updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+							if (var9.children != null) {
+								updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+							}
+
+							InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id);
+							if (var28 != null) {
+								if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
+									for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+										if (var29.isMouseInputEvent) {
+											var29.remove();
+											var29.widget.containsMouse = false;
+										}
+									}
+
+									if (class125.widgetDragDuration == 0) {
+										Client.clickedWidget = null;
+										Client.clickedWidgetParent = null;
+									}
+
+									if (!Client.isMenuOpen) {
+										Canvas.addCancelMenuEntry();
+									}
+								}
+
+								class18.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11);
+							}
+						}
+					}
+				}
 			}
-
-		} else {
-			Client.viewportTempX = -1;
-			Client.viewportTempY = -1;
 		}
+
 	}
 }

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

@@ -4,88 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ai")
+@ObfuscatedName("bj")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "Lnf;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lld;"
+		descriptor = "Llg;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Llu;"
+		descriptor = "Llw;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -471255991
+		intValue = 2077487873
 	)
-	int field713;
+	int field793;
 
 	@ObfuscatedSignature(
 		descriptor = "(Lnf;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field713 = 0;
+		this.field793 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-759002684"
+		garbageValue = "1042682832"
 	)
-	boolean method1473() {
-		return this.field713 == 2;
+	boolean method1682() {
+		return this.field793 == 2;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2024285394"
+		descriptor = "(B)V",
+		garbageValue = "80"
 	)
-	final void method1440() {
-		this.field713 = 1;
+	final void method1664() {
+		this.field793 = 1;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "-469570565"
+		descriptor = "(Lot;II)V",
+		garbageValue = "1294740095"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field713 = 2;
-		class107.method2293();
+		this.field793 = 2;
+
+		for (int var3 = 0; var3 < Players.Players_count; ++var3) {
+			Player var4 = Client.players[Players.Players_indices[var3]];
+			var4.clearIsFriend();
+		}
+
+		class17.method275();
+		if (class78.friendsChat != null) {
+			class78.friendsChat.clearFriends();
+		}
+
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-905255692"
+		descriptor = "(B)V",
+		garbageValue = "-71"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3846 < UrlRequester.method2125() / 1000L - 5L) {
+			if ((long)var1.field3943 < Occluder.method4335() / 1000L - 5L) {
 				if (var1.world > 0) {
-					class120.addGameMessage(5, "", var1.username + " has logged in.");
+					SecureRandomCallable.addGameMessage(5, "", var1.username + " has logged in.");
 				}
 
 				if (var1.world == 0) {
-					class120.addGameMessage(5, "", var1.username + " has logged out.");
+					SecureRandomCallable.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove();
@@ -94,38 +104,38 @@ public class FriendSystem {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1918010624"
+		descriptor = "(B)V",
+		garbageValue = "15"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field713 = 0;
+		this.field793 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Loh;ZI)Z",
-		garbageValue = "1313209132"
+		descriptor = "(Lpp;ZI)Z",
+		garbageValue = "-219417662"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(MouseHandler.localPlayer.username)) {
+		} else if (var1.equals(class129.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Loh;I)Z",
-		garbageValue = "-622518373"
+		descriptor = "(Lpp;B)Z",
+		garbageValue = "1"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -136,10 +146,10 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1772980259"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-1"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -147,37 +157,34 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsListIsFull()) {
-					SequenceDefinition.method3167();
-				} else if (MouseHandler.localPlayer.username.equals(var2)) {
-					MouseHandler.method369("You can't add yourself to your own friend list");
+					class274.method5065("Your friend list is full. Max of 200 for free users, and 400 for members");
+				} else if (class129.localPlayer.username.equals(var2)) {
+					class274.method5065("You can't add yourself to your own friend list");
 				} else if (this.isFriended(var2, false)) {
-					MouseHandler.method369(var1 + " is already on your friend list");
+					class274.method5065(var1 + " is already on your friend list");
 				} else if (this.isIgnored(var2)) {
-					MouseHandler.method369("Please remove " + var1 + " from your ignore list first");
+					class274.method5065("Please remove " + var1 + " from your ignore list first");
 				} else {
-					PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2564, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1));
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-					Client.packetWriter.addNode(var3);
+					LoginPacket.method4573(var1);
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "330747119"
+		garbageValue = "1656178783"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field525 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field608 != 1;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1413332284"
+		garbageValue = "1982011537"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
@@ -185,34 +192,34 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.canAddIgnore()) {
-					class315.method5681();
-				} else if (MouseHandler.localPlayer.username.equals(var2)) {
-					class270.method4928();
+					class354.method6255();
+				} else if (class129.localPlayer.username.equals(var2)) {
+					class274.method5065("You can't add yourself to your own ignore list");
 				} else if (this.isIgnored(var2)) {
-					MouseHandler.method369(var1 + " is already on your ignore list");
+					class274.method5065(var1 + " is already on your ignore list");
 				} else if (this.isFriended(var2, false)) {
-					MouseHandler.method369("Please remove " + var1 + " from your friend list first");
+					class274.method5065("Please remove " + var1 + " from your friend list first");
 				} else {
-					class376.method6562(var1);
+					TextureProvider.method4361(var1);
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "79"
+		descriptor = "(I)Z",
+		garbageValue = "-76002213"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field525 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field608 != 1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "0"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "262444453"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -220,22 +227,31 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					Client.field609 = Client.cycleCntr;
-					PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1));
+					Decimator.method1052();
+					PacketBufferNode var3 = getPacketBufferNode(ClientPacket.field2695, Client.packetWriter.isaacCipher);
+					var3.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				class107.method2293();
+				for (int var5 = 0; var5 < Players.Players_count; ++var5) {
+					Player var4 = Client.players[Players.Players_indices[var5]];
+					var4.clearIsFriend();
+				}
+
+				class17.method275();
+				if (class78.friendsChat != null) {
+					class78.friendsChat.clearFriends();
+				}
+
 			}
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1226126458"
+		garbageValue = "-451774086"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -243,22 +259,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					class124.method2539();
-					PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1));
+					Decimator.method1052();
+					PacketBufferNode var3 = getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher);
+					var3.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				AbstractByteArrayCopier.FriendSystem_invalidateIgnoreds();
+				WorldMapCacheName.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Loh;I)Z",
-		garbageValue = "-1196057065"
+		descriptor = "(Lpp;I)Z",
+		garbageValue = "-801266965"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
@@ -266,87 +282,89 @@ public class FriendSystem {
 		return var2 != null && var2.hasWorld();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;B)V",
-		garbageValue = "1"
+		descriptor = "(Lix;Loe;S)Lil;",
+		garbageValue = "-12337"
 	)
-	public static void method1452(AbstractArchive var0) {
-		VarbitComposition.VarbitDefinition_archive = var0;
+	@Export("getPacketBufferNode")
+	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
+		PacketBufferNode var2;
+		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) {
+			var2 = new PacketBufferNode();
+		} else {
+			var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount];
+		}
+
+		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);
+		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id);
+		var2.index = 0;
+		return var2;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Leg;",
-		garbageValue = "126"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "-1879853365"
 	)
-	@Export("VarpDefinition_get")
-	public static VarpDefinition VarpDefinition_get(int var0) {
-		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
-			var1 = new VarpDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
-			return var1;
+	@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("hz")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "738859003"
+		descriptor = "(B)Z",
+		garbageValue = "36"
 	)
-	@Export("updateItemPile")
-	static final void updateItemPile(int var0, int var1) {
-		NodeDeque var2 = Client.groundItems[GrandExchangeEvent.Client_plane][var0][var1];
-		if (var2 == null) {
-			WorldMapIcon_1.scene.removeGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1);
-		} else {
-			long var3 = -99999999L;
-			TileItem var5 = null;
+	public static boolean method1727() {
+		return class247.musicPlayerStatus != 0 ? true : class135.midiPcmStream.isReady();
+	}
 
-			TileItem var6;
-			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
-				ItemComposition var7 = KeyHandler.ItemDefinition_get(var6.id);
-				long var11 = (long)var7.price;
-				if (var7.isStackable == 1) {
-					var11 *= (long)(var6.quantity + 1);
-				}
-
-				if (var11 > var3) {
-					var3 = var11;
-					var5 = var6;
-				}
-			}
-
-			if (var5 == null) {
-				WorldMapIcon_1.scene.removeGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1);
-			} else {
-				var2.addLast(var5);
-				TileItem var13 = null;
-				TileItem var8 = null;
-
-				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
-					if (var6.id != var5.id) {
-						if (var13 == null) {
-							var13 = var6;
-						}
-
-						if (var6.id != var13.id && var8 == null) {
-							var8 = var6;
-						}
-					}
-				}
-
-				long var9 = class171.calculateTag(var0, var1, 3, false, 0);
-				WorldMapIcon_1.scene.newGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1, class122.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, GrandExchangeEvent.Client_plane), var5, var9, var13, var8);
-			}
+	@ObfuscatedName("fx")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "8"
+	)
+	@Export("playSong")
+	static void playSong(int var0) {
+		if (var0 == -1 && !Client.field728) {
+			Canvas.method371();
+		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && VarbitComposition.clientPreferences.musicVolume != 0 && !Client.field728) {
+			Archive var1 = class276.archive6;
+			int var2 = VarbitComposition.clientPreferences.musicVolume;
+			class247.musicPlayerStatus = 1;
+			class247.musicTrackArchive = var1;
+			class247.musicTrackGroupId = var0;
+			GrandExchangeOfferOwnWorldComparator.musicTrackFileId = 0;
+			class196.musicTrackVolume = var2;
+			class20.musicTrackBoolean = false;
+			class130.pcmSampleLength = 2;
 		}
+
+		Client.currentTrackGroupId = var0;
 	}
 }

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

@@ -4,160 +4,144 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lf")
+@ObfuscatedName("ls")
 @Implements("FriendsChat")
 public class FriendsChat extends UserList {
-	@ObfuscatedName("a")
+	@ObfuscatedName("rd")
 	@ObfuscatedSignature(
-		descriptor = "[Lnh;"
+		descriptor = "Lab;"
 	)
-	@Export("JagexCache_idxFiles")
-	public static BufferedFile[] JagexCache_idxFiles;
-	@ObfuscatedName("t")
+	@Export("pcmPlayer1")
+	static PcmPlayer pcmPlayer1;
+	@ObfuscatedName("cw")
+	@ObfuscatedSignature(
+		descriptor = "Loi;"
+	)
+	@Export("worldSelectRightSprite")
+	static IndexedSprite worldSelectRightSprite;
+	@ObfuscatedName("ky")
+	@ObfuscatedSignature(
+		descriptor = "Ljd;"
+	)
+	static Widget field3934;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "Lnf;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lla;"
+		descriptor = "Llt;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1047234431
+		intValue = 342416901
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1364708949
+		intValue = -2085968083
 	)
-	int field3837;
+	int field3932;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnf;Lla;)V"
+		descriptor = "(Lnf;Llt;)V"
 	)
 	public FriendsChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3837 = 1;
+		this.field3932 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llm;",
-		garbageValue = "-70"
+		descriptor = "(B)Lle;",
+		garbageValue = "27"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llm;",
-		garbageValue = "-2047984332"
+		descriptor = "(II)[Lle;",
+		garbageValue = "-1704587572"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1395184597"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "65"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = AbstractUserComparator.method5813(var1);
+		this.name = BuddyRankComparator.method2456(var1);
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1320826111"
+		garbageValue = "-1260867518"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = AbstractUserComparator.method5813(var1);
+		this.owner = BuddyRankComparator.method2456(var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;B)V",
-		garbageValue = "1"
+		descriptor = "(Lot;I)V",
+		garbageValue = "-661620065"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		long var5 = var2;
-		String var4;
-		int var7;
-		if (var2 > 0L && var2 < 6582952005840035281L) {
-			if (0L == var2 % 37L) {
-				var4 = null;
-			} else {
-				var7 = 0;
-
-				for (long var8 = var2; 0L != var8; var8 /= 37L) {
-					++var7;
-				}
-
-				StringBuilder var10 = new StringBuilder(var7);
-
-				while (0L != var5) {
-					long var11 = var5;
-					var5 /= 37L;
-					var10.append(class307.base37Table[(int)(var11 - var5 * 37L)]);
-				}
-
-				var4 = var10.reverse().toString();
-			}
-		} else {
-			var4 = null;
-		}
-
-		this.readName(var4);
+		this.readName(InterfaceParent.method2045(var2));
 		this.minKick = var1.readByte();
-		var7 = var1.readUnsignedByte();
-		if (var7 != 255) {
+		int var4 = var1.readUnsignedByte();
+		if (var4 != 255) {
 			this.clear();
 
-			for (int var13 = 0; var13 < var7; ++var13) {
-				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
-				int var14 = var1.readUnsignedShort();
-				var9.set(var14, ++this.field3837 - 1);
-				var9.rank = var1.readByte();
+			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.field3932 - 1);
+				var6.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
-				this.isLocalPlayer(var9);
+				this.isLocalPlayer(var6);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;B)V",
-		garbageValue = "-51"
+		descriptor = "(Lot;I)V",
+		garbageValue = "1745402205"
 	)
-	public final void method5724(Buffer var1) {
+	public final void method5877(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -187,17 +171,17 @@ public class FriendsChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3837 - 1);
+			var6.set(var3, ++this.field3932 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1329735244"
+		garbageValue = "2126941507"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -207,10 +191,10 @@ public class FriendsChat extends UserList {
 
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-975968384"
+		garbageValue = "-1035680702"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -220,10 +204,10 @@ public class FriendsChat extends UserList {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llg;B)V",
-		garbageValue = "76"
+		descriptor = "(Llq;I)V",
+		garbageValue = "-1627041344"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
@@ -232,4 +216,26 @@ public class FriendsChat extends UserList {
 		}
 
 	}
+
+	@ObfuscatedName("jf")
+	@ObfuscatedSignature(
+		descriptor = "(S)V",
+		garbageValue = "10673"
+	)
+	static final void method5904() {
+		PacketBufferNode var0 = FriendSystem.getPacketBufferNode(ClientPacket.field2699, Client.packetWriter.isaacCipher);
+		Client.packetWriter.addNode(var0);
+
+		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
+			if (var1.type == 0 || var1.type == 3) {
+				WorldMapID.closeInterface(var1, true);
+			}
+		}
+
+		if (Client.meslayerContinueWidget != null) {
+			Actor.invalidateWidget(Client.meslayerContinueWidget);
+			Client.meslayerContinueWidget = null;
+		}
+
+	}
 }

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

@@ -4,23 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ld")
+@ObfuscatedName("lg")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "Lnf;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1711234231
+		intValue = -1637915867
 	)
-	int field3828;
-	@ObfuscatedName("l")
+	int field3923;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lkh;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
@@ -30,35 +30,35 @@ public class FriendsList extends UserList {
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3828 = 1;
+		this.field3923 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llm;",
-		garbageValue = "-70"
+		descriptor = "(B)Lle;",
+		garbageValue = "27"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llm;",
-		garbageValue = "-2047984332"
+		descriptor = "(II)[Lle;",
+		garbageValue = "-1704587572"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Loh;ZI)Z",
-		garbageValue = "1216777375"
+		descriptor = "(Lpp;ZI)Z",
+		garbageValue = "1060300712"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -70,10 +70,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "2058052808"
+		descriptor = "(Lot;IB)V",
+		garbageValue = "16"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -137,17 +137,17 @@ public class FriendsList extends UserList {
 					}
 
 					if (var6 != var11.world) {
-						var11.int2 = ++this.field3828 - 1;
+						var11.int2 = ++this.field3923 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * 723168297) * -2065584103;
+							var11.int2 = -(var11.int2 * 897750695) * 1852682519;
 						}
 
 						var11.world = var6;
 					}
 
 					var11.rank = var7;
-					var11.field3842 = var9;
-					var11.field3841 = var10;
+					var11.field3936 = var9;
+					var11.field3937 = var10;
 					continue;
 				}
 

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

@@ -4,17 +4,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oj")
+@ObfuscatedName("pk")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("inflater")
 	Inflater inflater;
 
-	public GZipDecompressor() {
-		this(-1, 1000000, 1000000);
-	}
-
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
 		garbageValue = "1000000"
@@ -22,10 +18,14 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	@ObfuscatedName("s")
+	public GZipDecompressor() {
+		this(-1, 1000000, 1000000);
+	}
+
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;[BI)V",
-		garbageValue = "2001145466"
+		descriptor = "(Lot;[BB)V",
+		garbageValue = "20"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {

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

@@ -4,42 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ja")
+@ObfuscatedName("jw")
 @Implements("GameBuild")
 public class GameBuild {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lja;"
+		descriptor = "Ljw;"
 	)
 	@Export("LIVE")
 	static final GameBuild LIVE;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lja;"
+		descriptor = "Ljw;"
 	)
 	@Export("BUILDLIVE")
 	static final GameBuild BUILDLIVE;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lja;"
+		descriptor = "Ljw;"
 	)
 	@Export("RC")
 	static final GameBuild RC;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lja;"
+		descriptor = "Ljw;"
 	)
 	@Export("WIP")
 	static final GameBuild WIP;
-	@ObfuscatedName("l")
+	@ObfuscatedName("fo")
+	@ObfuscatedGetter(
+		intValue = 576858763
+	)
+	@Export("worldPort")
+	static int worldPort;
+	@ObfuscatedName("kq")
+	@ObfuscatedSignature(
+		descriptor = "Ljd;"
+	)
+	@Export("hoveredItemContainer")
+	static Widget hoveredItemContainer;
+	@ObfuscatedName("o")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1793986525
+		intValue = 1638239179
 	)
 	@Export("buildId")
-	public final int buildId;
+	final int buildId;
 
 	static {
 		LIVE = new GameBuild("LIVE", 0);
@@ -53,203 +65,59 @@ public class GameBuild {
 		this.buildId = var2;
 	}
 
-	@ObfuscatedName("io")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "824685565"
+		descriptor = "(IIIIB)V",
+		garbageValue = "-88"
 	)
-	@Export("addSceneMenuOptions")
-	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
-		if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
-			class7.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
-		}
-
-		long var4 = -1L;
-		long var6 = -1L;
-
-		int var8;
-		for (var8 = 0; var8 < NPC.method1960(); ++var8) {
-			long var25 = ViewportMouse.ViewportMouse_entityTags[var8];
-			if (var6 != var25) {
-				var6 = var25;
-				int var13 = Skeleton.method3973(var8);
-				int var14 = GrandExchangeEvent.method5152(var8);
-				int var15 = class266.method4916(ViewportMouse.ViewportMouse_entityTags[var8]);
-				int var17 = class78.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]);
-				int var18 = var17;
-				if (var15 == 2 && WorldMapIcon_1.scene.getObjectFlags(GrandExchangeEvent.Client_plane, var13, var14, var25) >= 0) {
-					ObjectComposition var19 = ClanChannel.getObjectDefinition(var17);
-					if (var19.transforms != null) {
-						var19 = var19.transform();
+	static final void method5068(int var0, int var1, int var2, int var3) {
+		for (int var4 = var1; var4 <= var3 + var1; ++var4) {
+			for (int var5 = var0; var5 <= var0 + var2; ++var5) {
+				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
+					FloorUnderlayDefinition.field1769[0][var5][var4] = 127;
+					if (var0 == var5 && var5 > 0) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
 					}
 
-					if (var19 == null) {
-						continue;
+					if (var0 + var2 == var5 && var5 < 103) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
 					}
 
-					if (Client.isItemSelected == 1) {
-						class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(65535) + var19.name, 1, var17, var13, var14);
-					} else if (Client.isSpellSelected) {
-						if ((ViewportMouse.selectedSpellFlags & 4) == 4) {
-							class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(65535) + var19.name, 2, var17, var13, var14);
-						}
-					} else {
-						String[] var20 = var19.actions;
-						if (var20 != null) {
-							for (int var21 = 4; var21 >= 0; --var21) {
-								if (var20[var21] != null) {
-									short var22 = 0;
-									if (var21 == 0) {
-										var22 = 3;
-									}
-
-									if (var21 == 1) {
-										var22 = 4;
-									}
-
-									if (var21 == 2) {
-										var22 = 5;
-									}
-
-									if (var21 == 3) {
-										var22 = 6;
-									}
-
-									if (var21 == 4) {
-										var22 = 1001;
-									}
-
-									class7.insertMenuItemNoShift(var20[var21], ScriptFrame.colorStartTag(65535) + var19.name, var22, var18, var13, var14);
-								}
-							}
-						}
-
-						class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14);
-					}
-				}
-
-				Player var23;
-				int var27;
-				NPC var28;
-				int var35;
-				int[] var36;
-				if (var15 == 1) {
-					NPC var31 = Client.npcs[var18];
-					if (var31 == null) {
-						continue;
+					if (var4 == var1 && var4 > 0) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
 					}
 
-					if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) {
-						for (var27 = 0; var27 < Client.npcCount; ++var27) {
-							var28 = Client.npcs[Client.npcIndices[var27]];
-							if (var28 != null && var28 != var31 && var28.definition.size == 1 && var28.x == var31.x && var31.y == var28.y) {
-								class290.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14);
-							}
-						}
-
-						var27 = Players.Players_count;
-						var36 = Players.Players_indices;
-
-						for (var35 = 0; var35 < var27; ++var35) {
-							var23 = Client.players[var36[var35]];
-							if (var23 != null && var31.x == var23.x && var23.y == var31.y) {
-								class1.addPlayerToMenu(var23, var36[var35], var13, var14);
-							}
-						}
-					}
-
-					class290.addNpcToMenu(var31.definition, var18, var13, var14);
-				}
-
-				if (var15 == 0) {
-					Player var32 = Client.players[var18];
-					if (var32 == null) {
-						continue;
-					}
-
-					if ((var32.x & 127) == 64 && (var32.y & 127) == 64) {
-						for (var27 = 0; var27 < Client.npcCount; ++var27) {
-							var28 = Client.npcs[Client.npcIndices[var27]];
-							if (var28 != null && var28.definition.size == 1 && var28.x == var32.x && var32.y == var28.y) {
-								class290.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14);
-							}
-						}
-
-						var27 = Players.Players_count;
-						var36 = Players.Players_indices;
-
-						for (var35 = 0; var35 < var27; ++var35) {
-							var23 = Client.players[var36[var35]];
-							if (var23 != null && var23 != var32 && var32.x == var23.x && var32.y == var23.y) {
-								class1.addPlayerToMenu(var23, var36[var35], var13, var14);
-							}
-						}
-					}
-
-					if (var18 != Client.combatTargetPlayerIndex) {
-						class1.addPlayerToMenu(var32, var18, var13, var14);
-					} else {
-						var4 = var25;
-					}
-				}
-
-				if (var15 == 3) {
-					NodeDeque var34 = Client.groundItems[GrandExchangeEvent.Client_plane][var13][var14];
-					if (var34 != null) {
-						for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) {
-							ItemComposition var37 = KeyHandler.ItemDefinition_get(var33.id);
-							if (Client.isItemSelected == 1) {
-								class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14);
-							} else if (Client.isSpellSelected) {
-								if ((ViewportMouse.selectedSpellFlags & 1) == 1) {
-									class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14);
-								}
-							} else {
-								String[] var29 = var37.groundActions;
-
-								for (int var30 = 4; var30 >= 0; --var30) {
-									if (var29 != null && var29[var30] != null) {
-										byte var24 = 0;
-										if (var30 == 0) {
-											var24 = 18;
-										}
-
-										if (var30 == 1) {
-											var24 = 19;
-										}
-
-										if (var30 == 2) {
-											var24 = 20;
-										}
-
-										if (var30 == 3) {
-											var24 = 21;
-										}
-
-										if (var30 == 4) {
-											var24 = 22;
-										}
-
-										class7.insertMenuItemNoShift(var29[var30], ScriptFrame.colorStartTag(16748608) + var37.name, var24, var33.id, var13, var14);
-									} else if (var30 == 2) {
-										class7.insertMenuItemNoShift("Take", ScriptFrame.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14);
-									}
-								}
-
-								class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14);
-							}
-						}
+					if (var3 + var1 == var4 && var4 < 103) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
 					}
 				}
 			}
 		}
 
-		if (var4 != -1L) {
-			var8 = ApproximateRouteStrategy.method880(var4);
-			int var9 = class79.method1990(var4);
-			Player var10 = Client.players[Client.combatTargetPlayerIndex];
-			class1.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9);
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "685937780"
+	)
+	public static int method5072(CharSequence var0) {
+		int var1 = var0.length();
+		int var2 = 0;
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var2 = (var2 << 5) - var2 + var0.charAt(var3);
 		}
 
+		return var2;
+	}
+
+	@ObfuscatedName("gp")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "381343872"
+	)
+	static final void method5073(int var0, int var1, int var2, int var3) {
+		ClanSettings.method2624();
 	}
 }

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

@@ -3,91 +3,90 @@ 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("hh")
+@ObfuscatedName("hj")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1421972333
+		intValue = -1075419309
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1203625827
+		intValue = 52594959
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1101114041
-	)
-	@Export("centerX")
-	int centerX;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 1652145053
-	)
-	@Export("centerY")
-	int centerY;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lgy;"
-	)
-	@Export("renderable")
-	public Renderable renderable;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -515786911
+		intValue = 675272483
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("w")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -530095189
+		intValue = 1949954399
+	)
+	@Export("centerX")
+	int centerX;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1781496417
+	)
+	@Export("centerY")
+	int centerY;
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "Lhr;"
+	)
+	@Export("renderable")
+	public Renderable renderable;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = 1888559139
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 803439659
+		intValue = -121960731
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1516171493
+		intValue = 181501421
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1126880699
+		intValue = -1330819283
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 2104357143
+		intValue = -1606485327
 	)
-	int field2541;
-	@ObfuscatedName("p")
+	int field2619;
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1530415993
+		intValue = 230666141
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = -7431595291754481309L
+		longValue = 4462777262073349723L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1220854209
+		intValue = -766138383
 	)
 	@Export("flags")
 	int flags;
@@ -97,68 +96,85 @@ public final class GameObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("fr")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lhv;",
-		garbageValue = "-873058170"
+		descriptor = "(Lcf;I)V",
+		garbageValue = "1001461113"
 	)
-	public static class227[] method4342() {
-		return new class227[]{class227.field2679, class227.field2675, class227.field2678, class227.field2676, class227.field2677, class227.field2680, class227.field2674, class227.field2683, class227.field2681, class227.field2682};
+	static final void method4495(Actor var0) {
+		int var1 = Math.max(1, var0.field1139 - Client.cycle);
+		int var2 = var0.field1137 * 64 + var0.field1135 * 128;
+		int var3 = var0.field1137 * 64 + var0.field1141 * 128;
+		var0.x += (var2 - var0.x) / var1;
+		var0.y += (var3 - var0.y) / var1;
+		var0.field1151 = 0;
+		var0.orientation = var0.field1101;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("hw")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "-1928503982"
+		descriptor = "(I)V",
+		garbageValue = "-316675303"
 	)
-	static int method4341(int var0, Script var1, boolean var2) {
-		Widget var7;
-		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) {
-			int var4;
-			if (var0 == ScriptOpcodes.CC_TRIGGEROP) {
-				var7 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget;
-				var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (var4 >= 1 && var4 <= 10) {
-					class79 var8 = new class79(var4, var7.id, var7.childIndex, var7.itemId);
-					Interpreter.field754.add(var8);
-					return 1;
-				} else {
-					throw new RuntimeException();
-				}
-			} else if (var0 == ScriptOpcodes.IF_TRIGGEROP) {
-				Interpreter.Interpreter_intStackSize -= 3;
-				int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-				if (var5 >= 1 && var5 <= 10) {
-					class79 var6 = new class79(var5, var3, var4, UrlRequester.getWidget(var3).itemId);
-					Interpreter.field754.add(var6);
-					return 1;
-				} else {
-					throw new RuntimeException();
-				}
-			} else {
-				return 2;
+	static final void method4496() {
+		PacketBuffer var0 = Client.packetWriter.packetBuffer;
+		var0.importIndex();
+		int var1 = var0.readBits(8);
+		int var2;
+		if (var1 < Client.npcCount) {
+			for (var2 = var1; var2 < Client.npcCount; ++var2) {
+				Client.field610[++Client.field495 - 1] = Client.npcIndices[var2];
 			}
-		} else if (Interpreter.field742 >= 10) {
-			throw new RuntimeException();
+		}
+
+		if (var1 > Client.npcCount) {
+			throw new RuntimeException("");
 		} else {
-			if (var0 >= 2000) {
-				var7 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			} else {
-				var7 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget;
+			Client.npcCount = 0;
+
+			for (var2 = 0; var2 < var1; ++var2) {
+				int var3 = Client.npcIndices[var2];
+				NPC var4 = Client.npcs[var3];
+				int var5 = var0.readBits(1);
+				if (var5 == 0) {
+					Client.npcIndices[++Client.npcCount - 1] = var3;
+					var4.npcCycle = Client.cycle;
+				} else {
+					int var6 = var0.readBits(2);
+					if (var6 == 0) {
+						Client.npcIndices[++Client.npcCount - 1] = var3;
+						var4.npcCycle = Client.cycle;
+						Client.field533[++Client.field560 - 1] = var3;
+					} else {
+						int var7;
+						int var8;
+						if (var6 == 1) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2212(var7, (byte)1);
+							var8 = var0.readBits(1);
+							if (var8 == 1) {
+								Client.field533[++Client.field560 - 1] = var3;
+							}
+						} else if (var6 == 2) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2212(var7, (byte)2);
+							var8 = var0.readBits(3);
+							var4.method2212(var8, (byte)2);
+							int var9 = var0.readBits(1);
+							if (var9 == 1) {
+								Client.field533[++Client.field560 - 1] = var3;
+							}
+						} else if (var6 == 3) {
+							Client.field610[++Client.field495 - 1] = var3;
+						}
+					}
+				}
 			}
 
-			if (var7.onResize == null) {
-				return 0;
-			} else {
-				ScriptEvent var9 = new ScriptEvent();
-				var9.widget = var7;
-				var9.args = var7.onResize;
-				var9.field961 = Interpreter.field742 + 1;
-				Client.scriptEvents.addFirst(var9);
-				return 1;
-			}
 		}
 	}
 }

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

@@ -3,44 +3,43 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jj")
+@ObfuscatedName("ko")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("kr")
-	@ObfuscatedGetter(
-		intValue = 672319355
+	@ObfuscatedName("ps")
+	@ObfuscatedSignature(
+		descriptor = "Lcg;"
 	)
-	@Export("Client_plane")
-	static int Client_plane;
-	@ObfuscatedName("s")
+	@Export("varcs")
+	static Varcs varcs;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1872389181
+		intValue = -196848983
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = -7476556361608611427L
+		longValue = -4175371854662876015L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Lkq;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;BI)V"
+		descriptor = "(Lot;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated();
@@ -50,8 +49,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt();
 		int var5 = var1.readInt();
 		this.grandExchangeOffer = new GrandExchangeOffer();
-		this.grandExchangeOffer.method5157(2);
-		this.grandExchangeOffer.method5158(var2);
+		this.grandExchangeOffer.method5332(2);
+		this.grandExchangeOffer.method5333(var2);
 		this.grandExchangeOffer.unitPrice = var4;
 		this.grandExchangeOffer.totalQuantity = var5;
 		this.grandExchangeOffer.currentQuantity = 0;
@@ -59,395 +58,88 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "-103"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "439020482"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1488255767"
+		garbageValue = "-1673368944"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "238780662"
+		descriptor = "(Ljava/lang/CharSequence;IZI)I",
+		garbageValue = "1968928867"
 	)
-	public static int method5152(int var0) {
-		long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
-		int var1 = (int)(var2 >>> 7 & 127L);
-		return var1;
-	}
+	static int method5326(CharSequence var0, int var1, boolean var2) {
+		if (var1 >= 2 && var1 <= 36) {
+			boolean var3 = false;
+			boolean var4 = false;
+			int var5 = 0;
+			int var6 = var0.length();
 
-	@ObfuscatedName("ae")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "-2107492280"
-	)
-	static int method5148(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.FRIEND_COUNT) {
-			if (Canvas.friendSystem.field713 == 0) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2;
-			} else if (Canvas.friendSystem.field713 == 1) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.friendsList.getSize();
+			for (int var7 = 0; var7 < var6; ++var7) {
+				char var8 = var0.charAt(var7);
+				if (var7 == 0) {
+					if (var8 == '-') {
+						var3 = true;
+						continue;
+					}
+
+					if (var8 == '+') {
+						continue;
+					}
+				}
+
+				int var10;
+				if (var8 >= '0' && var8 <= '9') {
+					var10 = var8 - '0';
+				} else if (var8 >= 'A' && var8 <= 'Z') {
+					var10 = var8 - '7';
+				} else {
+					if (var8 < 'a' || var8 > 'z') {
+						throw new NumberFormatException();
+					}
+
+					var10 = var8 - 'W';
+				}
+
+				if (var10 >= var1) {
+					throw new NumberFormatException();
+				}
+
+				if (var3) {
+					var10 = -var10;
+				}
+
+				int var9 = var10 + var5 * var1;
+				if (var9 / var1 != var5) {
+					throw new NumberFormatException();
+				}
+
+				var5 = var9;
+				var4 = true;
 			}
 
-			return 1;
+			if (!var4) {
+				throw new NumberFormatException();
+			} else {
+				return var5;
+			}
 		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) {
-					Friend var8 = (Friend)Canvas.friendSystem.friendsList.get(var3);
-					Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8.getName();
-					Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8.getPreviousName();
-				} else {
-					Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-					Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-				}
-
-				return 1;
-			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendSystem.friendsList.get(var3)).world;
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-				}
-
-				return 1;
-			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendSystem.friendsList.get(var3)).rank;
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-				}
-
-				return 1;
-			} else {
-				String var5;
-				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					FriendLoginUpdate.method5763(var5, var6);
-					return 1;
-				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					Canvas.friendSystem.addFriend(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					Canvas.friendSystem.removeFriend(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					Canvas.friendSystem.addIgnore(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					Canvas.friendSystem.removeIgnore(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					var5 = class52.method1648(var5);
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.isFriended(new Username(var5, GraphicsObject.loginType), false) ? 1 : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
-					if (MouseRecorder.friendsChat != null) {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.name;
-					} else {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
-					if (MouseRecorder.friendsChat != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat.getSize();
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.get(var3).getUsername().getName();
-					} else {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)MouseRecorder.friendsChat.get(var3)).getWorld();
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)MouseRecorder.friendsChat.get(var3)).rank;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat != null ? MouseRecorder.friendsChat.minKick : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					SecureRandomCallable.clanKickUser(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat != null ? MouseRecorder.friendsChat.rank * -1047234431 * 553895809 : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					GrandExchangeOfferOwnWorldComparator.Clan_joinChat(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
-					Login.Clan_leaveChat();
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
-					if (!Canvas.friendSystem.method1473()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.ignoreList.getSize();
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.ignoreList.getSize()) {
-						Ignored var4 = (Ignored)Canvas.friendSystem.ignoreList.get(var3);
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getName();
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getPreviousName();
-					} else {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize];
-					var5 = class52.method1648(var5);
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.isIgnored(new Username(var5, GraphicsObject.loginType)) ? 1 : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && MouseRecorder.friendsChat.get(var3).getUsername().equals(MouseHandler.localPlayer.username)) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
-					if (MouseRecorder.friendsChat != null && MouseRecorder.friendsChat.owner != null) {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.owner;
-					} else {
-						Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && ((ClanMate)MouseRecorder.friendsChat.get(var3)).isFriend()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
-					if (var0 == 3628) {
-						Canvas.friendSystem.friendsList.removeComparator();
-						return 1;
-					} else {
-						boolean var7;
-						if (var0 == 3629) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator1(var7));
-							return 1;
-						} else if (var0 == 3630) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator2(var7));
-							return 1;
-						} else if (var0 == 3631) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator3(var7));
-							return 1;
-						} else if (var0 == 3632) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator4(var7));
-							return 1;
-						} else if (var0 == 3633) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator5(var7));
-							return 1;
-						} else if (var0 == 3634) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator6(var7));
-							return 1;
-						} else if (var0 == 3635) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator7(var7));
-							return 1;
-						} else if (var0 == 3636) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator8(var7));
-							return 1;
-						} else if (var0 == 3637) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator9(var7));
-							return 1;
-						} else if (var0 == 3638) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new UserComparator10(var7));
-							return 1;
-						} else if (var0 == 3639) {
-							Canvas.friendSystem.friendsList.sort();
-							return 1;
-						} else if (var0 == 3640) {
-							Canvas.friendSystem.ignoreList.removeComparator();
-							return 1;
-						} else if (var0 == 3641) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
-							return 1;
-						} else if (var0 == 3642) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
-							return 1;
-						} else if (var0 == 3643) {
-							Canvas.friendSystem.ignoreList.sort();
-							return 1;
-						} else if (var0 == 3644) {
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.removeComparator();
-							}
-
-							return 1;
-						} else if (var0 == 3645) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator1(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3646) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator2(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3647) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator3(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3648) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator4(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3649) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator5(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3650) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator6(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3651) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator7(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3652) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator8(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3653) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator9(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3654) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new UserComparator10(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3655) {
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.sort();
-							}
-
-							return 1;
-						} else if (var0 == 3656) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Canvas.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7));
-							return 1;
-						} else if (var0 == 3657) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (MouseRecorder.friendsChat != null) {
-								MouseRecorder.friendsChat.addComparator(new BuddyRankComparator(var7));
-							}
-
-							return 1;
-						} else {
-							return 2;
-						}
-					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && ((ClanMate)MouseRecorder.friendsChat.get(var3)).isIgnored()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				}
-			}
+			throw new IllegalArgumentException("" + var1);
 		}
 	}
 }

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

@@ -7,22 +7,22 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jf")
+@ObfuscatedName("km")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("events")
 	public final List events;
 
@@ -35,7 +35,7 @@ public class GrandExchangeEvents {
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;Z)V",
+		descriptor = "(Lot;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -57,10 +57,10 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/Comparator;ZI)V",
-		garbageValue = "1669193209"
+		descriptor = "(Ljava/util/Comparator;ZB)V",
+		garbageValue = "-93"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -71,4 +71,26 @@ public class GrandExchangeEvents {
 		}
 
 	}
+
+	@ObfuscatedName("ip")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		garbageValue = "1583510201"
+	)
+	@Export("insertMenuItem")
+	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		if (!Client.isMenuOpen) {
+			if (Client.menuOptionsCount < 500) {
+				Client.menuActions[Client.menuOptionsCount] = var0;
+				Client.menuTargets[Client.menuOptionsCount] = var1;
+				Client.menuOpcodes[Client.menuOptionsCount] = var2;
+				Client.menuIdentifiers[Client.menuOptionsCount] = var3;
+				Client.menuArguments1[Client.menuOptionsCount] = var4;
+				Client.menuArguments2[Client.menuOptionsCount] = var5;
+				Client.menuShiftClick[Client.menuOptionsCount] = var6;
+				++Client.menuOptionsCount;
+			}
+
+		}
+	}
 }

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

@@ -4,45 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jk")
+@ObfuscatedName("kq")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
 	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("scriptDotWidget")
-	static Widget scriptDotWidget;
-	@ObfuscatedName("s")
+	static int[] field3769;
+	@ObfuscatedName("n")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -738417027
+		intValue = 1885544773
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 902744841
+		intValue = -1068501763
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1486444339
+		intValue = -691773445
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -445380121
+		intValue = 65758811
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -421297425
+		intValue = 358624203
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -51,7 +47,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;Z)V",
+		descriptor = "(Lot;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -63,42 +59,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1580532327"
+		garbageValue = "-165905974"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-51"
+		garbageValue = "1"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "2117063899"
+		descriptor = "(IB)V",
+		garbageValue = "-29"
 	)
-	void method5157(int var1) {
+	void method5332(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "1"
+		descriptor = "(II)V",
+		garbageValue = "-347764080"
 	)
-	void method5158(int var1) {
+	void method5333(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -106,53 +102,71 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-240867466"
+		descriptor = "(IB)Len;",
+		garbageValue = "3"
 	)
-	static void method5168() {
-		Messages.Messages_channels.clear();
-		Messages.Messages_hashTable.clear();
-		Messages.Messages_queue.clear();
-		Messages.Messages_count = 0;
+	@Export("getInvDefinition")
+	public static InvDefinition getInvDefinition(int var0) {
+		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
+			var1 = new InvDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			InvDefinition.InvDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "77"
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "108"
 	)
-	public static String method5167(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 = Clock.method2679(var5);
-			}
-
-			if (Character.isLetter(var5)) {
-				var3 = 0;
-			} else if (var5 != '.' && var5 != '?' && var5 != '!') {
-				if (Character.isSpaceChar(var5)) {
-					if (var3 != 2) {
-						var3 = 1;
-					}
-				} else {
-					var3 = 1;
-				}
+	static int method5345(int var0, Script var1, boolean var2) {
+		if (var0 == 7100) {
+			++class240.Interpreter_intStackSize;
+			return 1;
+		} else if (var0 == 7101) {
+			Interpreter.Interpreter_stringStackSize += 2;
+			return 1;
+		} else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) {
+			if (var0 == 7106) {
+				++class240.Interpreter_intStackSize;
+				return 1;
+			} else if (var0 == 7107) {
+				++class240.Interpreter_intStackSize;
+				return 1;
+			} else if (var0 == 7108) {
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class258.method4892() ? 1 : 0;
+				return 1;
+			} else if (var0 == 7110) {
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+				return 1;
+			} else if (var0 == 7120) {
+				--class240.Interpreter_intStackSize;
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+				return 1;
+			} else if (var0 == 7121) {
+				class240.Interpreter_intStackSize -= 2;
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+				return 1;
+			} else if (var0 == 7122) {
+				class240.Interpreter_intStackSize -= 2;
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0;
+				return 1;
 			} else {
-				var3 = 2;
+				return 2;
 			}
-
-			var2[var4] = var5;
+		} else {
+			++class240.Interpreter_intStackSize;
+			return 1;
 		}
-
-		return new String(var2);
 	}
 }

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

@@ -1,80 +1,129 @@
+import java.io.File;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ju")
+@ObfuscatedName("ky")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 1278349979
-	)
-	@Export("VarpDefinition_fileCount")
-	public static int VarpDefinition_fileCount;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 1870973391
-	)
-	public static int field3633;
+	@ObfuscatedName("k")
+	@Export("JagexCache_locationFile")
+	public static File JagexCache_locationFile;
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljj;Ljj;I)I",
-		garbageValue = "-1896317478"
+		descriptor = "(Lko;Lko;B)I",
+		garbageValue = "-21"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1);
-	}
-
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+		return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1);
 	}
 
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-113649637"
-	)
-	static final int method5126(int var0, int var1) {
-		int var2 = ParamComposition.method2925(var0 - 1, var1 - 1) + ParamComposition.method2925(1 + var0, var1 - 1) + ParamComposition.method2925(var0 - 1, var1 + 1) + ParamComposition.method2925(1 + var0, var1 + 1);
-		int var3 = ParamComposition.method2925(var0 - 1, var1) + ParamComposition.method2925(var0 + 1, var1) + ParamComposition.method2925(var0, var1 - 1) + ParamComposition.method2925(var0, 1 + var1);
-		int var4 = ParamComposition.method2925(var0, var1);
-		return var2 / 16 + var3 / 8 + var4 / 4;
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "-189475512"
+		descriptor = "(CLka;B)C",
+		garbageValue = "5"
 	)
-	@Export("isDigit")
-	public static boolean isDigit(char var0) {
-		return var0 >= '0' && var0 <= '9';
+	@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 'O';
+		} else if (var0 == 339) {
+			return 'o';
+		} else if (var0 == 376) {
+			return 'Y';
+		} else {
+			return var0;
+		}
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-439805198"
+		descriptor = "(Ljava/lang/CharSequence;S)I",
+		garbageValue = "5874"
 	)
-	static int method5132(int var0) {
-		return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F));
-	}
-
-	@ObfuscatedName("bv")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-1957941774"
-	)
-	public static int method5131(String var0) {
-		return var0.length() + 2;
+	public static int method5303(CharSequence var0) {
+		return GrandExchangeEvent.method5326(var0, 10, true);
 	}
 }

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

@@ -1,34 +1,16 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jl")
+@ObfuscatedName("ku")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		longValue = -3156287025995646729L
-	)
-	static long field3625;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = 770071241
-	)
-	static int field3628;
-	@ObfuscatedName("ge")
-	@ObfuscatedGetter(
-		intValue = 964659383
-	)
-	@Export("baseX")
-	static int baseX;
-
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljj;Ljj;B)I",
-		garbageValue = "14"
+		descriptor = "(Lko;Lko;I)I",
+		garbageValue = "-664898748"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -42,14 +24,4 @@ final class GrandExchangeOfferNameComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
-
-	@ObfuscatedName("br")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-671560252"
-	)
-	@Export("stringCp1252NullTerminatedByteSize")
-	public static int stringCp1252NullTerminatedByteSize(String var0) {
-		return var0.length() + 1;
-	}
 }

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

@@ -1,35 +1,41 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ah")
+@ObfuscatedName("bw")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lof;"
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -1422085105
 	)
-	@Export("options_buttons_0Sprite")
-	static IndexedSprite options_buttons_0Sprite;
-	@ObfuscatedName("fk")
+	@Export("musicTrackFileId")
+	public static int musicTrackFileId;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkt;"
+		descriptor = "Lkk;"
 	)
-	@Export("fontPlain11")
-	static Font fontPlain11;
-	@ObfuscatedName("s")
+	@Export("Widget_modelsArchive")
+	public static AbstractArchive Widget_modelsArchive;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 414005331
+	)
+	static int field475;
+	@ObfuscatedName("n")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljj;Ljj;I)I",
-		garbageValue = "702454082"
+		descriptor = "(Lko;Lko;I)I",
+		garbageValue = "-1867608440"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -58,61 +64,42 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)I",
-		garbageValue = "1440909835"
+		descriptor = "(I)V",
+		garbageValue = "1707101499"
 	)
-	static final int method890(int var0, int var1, int var2, int var3) {
-		int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1;
-		return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16);
+	public static void method1133() {
+		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
 	}
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("gq")
 	@ObfuscatedSignature(
-		descriptor = "([BI)[B",
-		garbageValue = "2121777325"
+		descriptor = "(I)V",
+		garbageValue = "1733564900"
 	)
-	@Export("decompressBytes")
-	static final byte[] decompressBytes(byte[] var0) {
-		Buffer var1 = new Buffer(var0);
-		int var2 = var1.readUnsignedByte();
-		int var3 = var1.readInt();
-		if (var3 < 0 || AbstractArchive.field3591 != 0 && var3 > AbstractArchive.field3591) {
-			throw new RuntimeException();
-		} else if (var2 == 0) {
-			byte[] var6 = new byte[var3];
-			var1.readBytes(var6, 0, var3);
-			return var6;
-		} else {
-			int var4 = var1.readInt();
-			if (var4 >= 0 && (AbstractArchive.field3591 == 0 || var4 <= AbstractArchive.field3591)) {
-				byte[] var5 = new byte[var4];
-				if (var2 == 1) {
-					BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
-				} else {
-					AbstractArchive.gzipDecompressor.decompress(var1, var5);
-				}
-
-				return var5;
-			} else {
-				throw new RuntimeException();
-			}
+	static void method1134() {
+		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
+			class114.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false);
 		}
+
 	}
 
-	@ObfuscatedName("kx")
+	@ObfuscatedName("hx")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1148986120"
+		descriptor = "(IB)Z",
+		garbageValue = "10"
 	)
-	@Export("Clan_joinChat")
-	static final void Clan_joinChat(String var0) {
-		if (!var0.equals("")) {
-			PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher);
-			var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0));
-			var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-			Client.packetWriter.addNode(var1);
+	static final boolean method1132(int var0) {
+		if (var0 < 0) {
+			return false;
+		} else {
+			int var1 = Client.menuOpcodes[var0];
+			if (var1 >= 2000) {
+				var1 -= 2000;
+			}
+
+			return var1 == 1007;
 		}
 	}
 }

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

@@ -4,13 +4,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jp")
+@ObfuscatedName("kw")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljj;Ljj;B)I",
-		garbageValue = "19"
+		descriptor = "(Lko;Lko;S)I",
+		garbageValue = "255"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {

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

@@ -4,76 +4,67 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kn")
+@ObfuscatedName("kd")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("od")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lkk;"
 	)
-	@Export("HitSplatDefinition_cachedSprites")
-	static class371 HitSplatDefinition_cachedSprites;
+	@Export("KitDefinition_modelsArchive")
+	static AbstractArchive KitDefinition_modelsArchive;
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljj;Ljj;B)I",
-		garbageValue = "69"
+		descriptor = "(Lko;Lko;B)I",
+		garbageValue = "29"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 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);
 	}
 
-	@ObfuscatedName("jc")
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;IIZB)V",
-		garbageValue = "37"
+		descriptor = "([Ljava/lang/String;[IIII)V",
+		garbageValue = "-1159909186"
 	)
-	@Export("alignWidgetSize")
-	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
-		int var4 = var0.width;
-		int var5 = var0.height;
-		if (var0.widthAlignment == 0) {
-			var0.width = var0.rawWidth;
-		} else if (var0.widthAlignment == 1) {
-			var0.width = var1 - var0.rawWidth;
-		} else if (var0.widthAlignment == 2) {
-			var0.width = var0.rawWidth * var1 >> 14;
-		}
+	static void method5348(String[] var0, int[] var1, int var2, int var3) {
+		if (var2 < var3) {
+			int var4 = (var3 + var2) / 2;
+			int var5 = var2;
+			String var6 = var0[var4];
+			var0[var4] = var0[var3];
+			var0[var3] = var6;
+			int var7 = var1[var4];
+			var1[var4] = var1[var3];
+			var1[var3] = var7;
 
-		if (var0.heightAlignment == 0) {
-			var0.height = var0.rawHeight;
-		} else if (var0.heightAlignment == 1) {
-			var0.height = var2 - var0.rawHeight;
-		} else if (var0.heightAlignment == 2) {
-			var0.height = var2 * var0.rawHeight >> 14;
-		}
+			for (int var8 = var2; var8 < var3; ++var8) {
+				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
+					String var9 = var0[var8];
+					var0[var8] = var0[var5];
+					var0[var5] = var9;
+					int var10 = var1[var8];
+					var1[var8] = var1[var5];
+					var1[var5++] = var10;
+				}
+			}
 
-		if (var0.widthAlignment == 4) {
-			var0.width = var0.height * var0.field2974 / var0.field2975;
-		}
-
-		if (var0.heightAlignment == 4) {
-			var0.height = var0.field2975 * var0.width / var0.field2974;
-		}
-
-		if (var0.contentType == 1337) {
-			Client.viewportWidget = var0;
-		}
-
-		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) {
-			ScriptEvent var6 = new ScriptEvent();
-			var6.widget = var0;
-			var6.args = var0.onResize;
-			Client.scriptEvents.addFirst(var6);
+			var0[var3] = var0[var5];
+			var0[var5] = var6;
+			var1[var3] = var1[var5];
+			var1[var5] = var7;
+			method5348(var0, var1, var2, var5 - 1);
+			method5348(var0, var1, var5 + 1, var3);
 		}
 
 	}

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

@@ -4,89 +4,50 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jx")
+@ObfuscatedName("kv")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("bw")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lkq;"
-	)
-	@Export("clientLanguage")
-	static Language clientLanguage;
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Ljj;Ljj;I)I",
-		garbageValue = "2116557757"
+		descriptor = "(Lko;Lko;I)I",
+		garbageValue = "16711680"
 	)
 	@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);
 	}
 
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "([BIII)Ljava/lang/String;",
-		garbageValue = "1878009564"
-	)
-	public static String method5141(byte[] var0, int var1, int var2) {
-		char[] var3 = new char[var2];
-		int var4 = 0;
-		int var5 = var1;
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}
 
-		int var8;
-		for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) {
-			int var7 = var0[var5++] & 255;
-			if (var7 < 128) {
-				if (var7 == 0) {
-					var8 = 65533;
-				} else {
-					var8 = var7;
-				}
-			} else if (var7 < 192) {
-				var8 = 65533;
-			} else if (var7 < 224) {
-				if (var5 < var6 && (var0[var5] & 192) == 128) {
-					var8 = (var7 & 31) << 6 | var0[var5++] & 63;
-					if (var8 < 128) {
-						var8 = 65533;
-					}
-				} else {
-					var8 = 65533;
-				}
-			} else if (var7 < 240) {
-				if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) {
-					var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63;
-					if (var8 < 2048) {
-						var8 = 65533;
-					}
-				} else {
-					var8 = 65533;
-				}
-			} else if (var7 < 248) {
-				if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) {
-					var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63;
-					if (var8 >= 65536 && var8 <= 1114111) {
-						var8 = 65533;
-					} else {
-						var8 = 65533;
-					}
-				} else {
-					var8 = 65533;
-				}
-			} else {
-				var8 = 65533;
-			}
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(I)[I",
+		garbageValue = "-1164500663"
+	)
+	public static int[] method5320() {
+		int[] var0 = new int[KeyHandler.field114];
+
+		for (int var1 = 0; var1 < KeyHandler.field114; ++var1) {
+			var0[var1] = KeyHandler.field131[var1];
 		}
 
-		return new String(var3, 0, var4);
+		return var0;
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lbh;",
+		garbageValue = "-994798359"
+	)
+	@Export("worldListStart")
+	static World worldListStart() {
+		World.World_listCount = 0;
+		return SequenceDefinition.getNextWorldListWorld();
 	}
 }

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

@@ -1,98 +1,98 @@
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
 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("lq")
+@ObfuscatedName("mp")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "Lof;"
-	)
-	static IndexedSprite field3919;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -725671069
+		intValue = -1507900215
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 281871837
+		intValue = 2099513777
 	)
-	public int field3915;
-	@ObfuscatedName("v")
+	public int field4001;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -714909153
+		intValue = 1141431167
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 359740853
+		intValue = 302197759
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -1827053533
-	)
-	public int field3910;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -1525663871
-	)
-	public int field3912;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = 1041444647
-	)
-	public int field3908;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -1591959495
-	)
-	public int field3914;
 	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -262798545
+		intValue = -1025961101
 	)
-	public int field3913;
-	@ObfuscatedName("x")
+	public int field4004;
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1828601193
+		intValue = 628282865
 	)
-	public int field3911;
-	@ObfuscatedName("r")
+	public int field4003;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1968587229
+		intValue = 879536881
 	)
-	public int field3917;
+	public int field4006;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -268778877
+	)
+	public int field4007;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 504736861
+	)
+	public int field4008;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -561061723
+	)
+	public int field4009;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 1993952991
+	)
+	public int field4010;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3915 = -1;
+		this.field4001 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3910 = -1;
-		this.field3912 = -1;
-		this.field3908 = -1;
-		this.field3914 = -1;
-		this.field3913 = -1;
-		this.field3911 = -1;
-		this.field3917 = -1;
+		this.field4004 = -1;
+		this.field4003 = -1;
+		this.field4006 = -1;
+		this.field4007 = -1;
+		this.field4008 = -1;
+		this.field4009 = -1;
+		this.field4010 = -1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ljy;I)V",
-		garbageValue = "2124642870"
+		descriptor = "(Lkk;I)V",
+		garbageValue = "-2116063360"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3904.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3999.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -106,48 +106,71 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method6674();
-				this.field3915 = var3.method6674();
-				this.mapScenes = var3.method6674();
-				this.headIconsPk = var3.method6674();
-				this.field3910 = var3.method6674();
-				this.field3912 = var3.method6674();
-				this.field3908 = var3.method6674();
-				this.field3914 = var3.method6674();
-				this.field3913 = var3.method6674();
-				this.field3911 = var3.method6674();
-				this.field3917 = var3.method6674();
+				this.compass = var3.method6985();
+				this.field4001 = var3.method6985();
+				this.mapScenes = var3.method6985();
+				this.headIconsPk = var3.method6985();
+				this.field4004 = var3.method6985();
+				this.field4003 = var3.method6985();
+				this.field4006 = var3.method6985();
+				this.field4007 = var3.method6985();
+				this.field4008 = var3.method6985();
+				this.field4009 = var3.method6985();
+				this.field4010 = var3.method6985();
 			}
 		}
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "315603069"
+		descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;",
+		garbageValue = "2097439645"
 	)
-	static int method6024(int var0, Script var1, boolean var2) {
-		if (var0 == 6800) {
-			Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-			return 1;
-		} else if (var0 != 6801 && var0 != 6802) {
-			if (var0 == 6850) {
-				Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "";
-				return 1;
-			} else if (var0 != 6851 && var0 != 6852) {
-				if (var0 == 6853) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					return 1;
-				} else {
-					return 2;
-				}
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-				return 1;
-			}
+	static String method6184(Throwable var0) throws IOException {
+		String var1;
+		if (var0 instanceof RunException) {
+			RunException var2 = (RunException)var0;
+			var1 = var2.message + " | ";
+			var0 = var2.throwable;
 		} else {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-			return 1;
+			var1 = "";
+		}
+
+		StringWriter var12 = new StringWriter();
+		PrintWriter var3 = new PrintWriter(var12);
+		var0.printStackTrace(var3);
+		var3.close();
+		String var4 = var12.toString();
+		BufferedReader var5 = new BufferedReader(new StringReader(var4));
+		String var6 = var5.readLine();
+
+		while (true) {
+			while (true) {
+				String var7 = var5.readLine();
+				if (var7 == null) {
+					var1 = var1 + "| " + var6;
+					return var1;
+				}
+
+				int var8 = var7.indexOf(40);
+				int var9 = var7.indexOf(41, var8 + 1);
+				if (var8 >= 0 && var9 >= 0) {
+					String var10 = var7.substring(var8 + 1, var9);
+					int var11 = var10.indexOf(".java:");
+					if (var11 >= 0) {
+						var10 = var10.substring(0, var11) + var10.substring(var11 + 5);
+						var1 = var1 + var10 + ' ';
+						continue;
+					}
+
+					var7 = var7.substring(0, var8);
+				}
+
+				var7 = var7.trim();
+				var7 = var7.substring(var7.lastIndexOf(32) + 1);
+				var7 = var7.substring(var7.lastIndexOf(9) + 1);
+				var1 = var1 + var7 + ' ';
+			}
 		}
 	}
 }

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

@@ -1,87 +1,73 @@
-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("aw")
+@ObfuscatedName("bu")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Renderable {
-	@ObfuscatedName("bf")
+	@ObfuscatedName("hu")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "[Loc;"
 	)
-	@Export("loginType")
-	static LoginType loginType;
-	@ObfuscatedName("bw")
-	@ObfuscatedSignature(
-		descriptor = "[Lof;"
-	)
-	@Export("worldSelectFlagSprites")
-	static IndexedSprite[] worldSelectFlagSprites;
-	@ObfuscatedName("ld")
+	@Export("headIconPrayerSprites")
+	static SpritePixels[] headIconPrayerSprites;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 632390903
-	)
-	@Export("menuHeight")
-	static int menuHeight;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -962046693
+		intValue = 787410799
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 764906277
+		intValue = 1229158723
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -2015841491
+		intValue = -607075051
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -239549733
+		intValue = -554255129
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -800969311
+		intValue = 1557602107
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1195317417
+		intValue = 556318843
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lfz;"
+		descriptor = "Lfa;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1468887815
+		intValue = -492546341
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -692732741
+		intValue = 296318011
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -95,20 +81,20 @@ public final class GraphicsObject extends Renderable {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = PcmPlayer.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = TaskHandler.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = World.SequenceDefinition_get(var8);
+			this.sequenceDefinition = class17.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1996698154"
+		garbageValue = "1654884246"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -127,14 +113,14 @@ public final class GraphicsObject extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgl;",
-		garbageValue = "1291603774"
+		descriptor = "(B)Lhg;",
+		garbageValue = "18"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = PcmPlayer.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = TaskHandler.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -145,329 +131,161 @@ public final class GraphicsObject extends Renderable {
 		return var2 == null ? null : var2;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Leb;",
-		garbageValue = "315871348"
+		descriptor = "(IILfw;Lfk;I)Z",
+		garbageValue = "1454497759"
 	)
-	public static HealthBarDefinition method1647(int var0) {
-		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
+	static final boolean method1869(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+		int var4 = var0;
+		int var5 = var1;
+		byte var6 = 64;
+		byte var7 = 64;
+		int var8 = var0 - var6;
+		int var9 = var1 - var7;
+		class174.directions[var6][var7] = 99;
+		class174.distances[var6][var7] = 0;
+		byte var10 = 0;
+		int var11 = 0;
+		class174.bufferX[var10] = var0;
+		byte var10001 = var10;
+		int var18 = var10 + 1;
+		class174.bufferY[var10001] = var1;
+		int[][] var12 = var3.flags;
+
+		while (var11 != var18) {
+			var4 = class174.bufferX[var11];
+			var5 = class174.bufferY[var11];
+			var11 = var11 + 1 & 4095;
+			int var16 = var4 - var8;
+			int var17 = var5 - var9;
+			int var13 = var4 - var3.xInset;
+			int var14 = var5 - var3.yInset;
+			if (var2.hasArrived(1, var4, var5, var3)) {
+				class150.field1601 = var4;
+				class174.field1991 = var5;
+				return true;
+			}
+
+			int var15 = class174.distances[var16][var17] + 1;
+			if (var16 > 0 && class174.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) {
+				class174.bufferX[var18] = var4 - 1;
+				class174.bufferY[var18] = var5;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16 - 1][var17] = 2;
+				class174.distances[var16 - 1][var17] = var15;
+			}
+
+			if (var16 < 127 && class174.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) {
+				class174.bufferX[var18] = var4 + 1;
+				class174.bufferY[var18] = var5;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16 + 1][var17] = 8;
+				class174.distances[var16 + 1][var17] = var15;
+			}
+
+			if (var17 > 0 && class174.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) {
+				class174.bufferX[var18] = var4;
+				class174.bufferY[var18] = var5 - 1;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16][var17 - 1] = 1;
+				class174.distances[var16][var17 - 1] = var15;
+			}
+
+			if (var17 < 127 && class174.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) {
+				class174.bufferX[var18] = var4;
+				class174.bufferY[var18] = var5 + 1;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16][var17 + 1] = 4;
+				class174.distances[var16][var17 + 1] = var15;
+			}
+
+			if (var16 > 0 && var17 > 0 && class174.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) {
+				class174.bufferX[var18] = var4 - 1;
+				class174.bufferY[var18] = var5 - 1;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16 - 1][var17 - 1] = 3;
+				class174.distances[var16 - 1][var17 - 1] = var15;
+			}
+
+			if (var16 < 127 && var17 > 0 && class174.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) {
+				class174.bufferX[var18] = var4 + 1;
+				class174.bufferY[var18] = var5 - 1;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16 + 1][var17 - 1] = 9;
+				class174.distances[var16 + 1][var17 - 1] = var15;
+			}
+
+			if (var16 > 0 && var17 < 127 && class174.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) {
+				class174.bufferX[var18] = var4 - 1;
+				class174.bufferY[var18] = var5 + 1;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16 - 1][var17 + 1] = 6;
+				class174.distances[var16 - 1][var17 + 1] = var15;
+			}
+
+			if (var16 < 127 && var17 < 127 && class174.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) {
+				class174.bufferX[var18] = var4 + 1;
+				class174.bufferY[var18] = var5 + 1;
+				var18 = var18 + 1 & 4095;
+				class174.directions[var16 + 1][var17 + 1] = 12;
+				class174.distances[var16 + 1][var17 + 1] = var15;
+			}
+		}
+
+		class150.field1601 = var4;
+		class174.field1991 = var5;
+		return false;
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "1937587259"
+	)
+	public static boolean method1871(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.field125[var0] : false;
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+		garbageValue = "-380670823"
+	)
+	public static String method1866(CharSequence var0) {
+		int var2 = var0.length();
+		char[] var3 = new char[var2];
+
+		for (int var4 = 0; var4 < var2; ++var4) {
+			var3[var4] = '*';
+		}
+
+		String var1 = new String(var3);
+		return var1;
+	}
+
+	@ObfuscatedName("gx")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)I",
+		garbageValue = "35"
+	)
+	@Export("getTileHeight")
+	static final int getTileHeight(int var0, int var1, int var2) {
+		int var3 = var0 >> 7;
+		int var4 = var1 >> 7;
+		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
+			int var5 = var2;
+			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
+				var5 = var2 + 1;
+			}
+
+			int var6 = var0 & 127;
+			int var7 = var1 & 127;
+			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7;
+			int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7;
+			return var7 * var9 + var8 * (128 - var7) >> 7;
 		} else {
-			byte[] var2 = DevicePcmPlayerProvider.HealthBarDefinition_archive.takeFile(33, var0);
-			var1 = new HealthBarDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/io/File;ZB)Z",
-		garbageValue = "-45"
-	)
-	static boolean method1645(File var0, boolean var1) {
-		try {
-			RandomAccessFile var2 = new RandomAccessFile(var0, "rw");
-			int var3 = var2.read();
-			var2.seek(0L);
-			var2.write(var3);
-			var2.seek(0L);
-			var2.close();
-			return true;
-		} catch (Exception var4) {
-			return false;
-		}
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;I)V",
-		garbageValue = "2107200471"
-	)
-	static void method1646(Font var0, Font var1) {
-		if (WorldMapAreaData.worldSelectBackSprites == null) {
-			WorldMapAreaData.worldSelectBackSprites = ChatChannel.method1735(class270.archive8, "sl_back", "");
-		}
-
-		IndexedSprite[] var2;
-		Archive var3;
-		int var4;
-		int var5;
-		if (worldSelectFlagSprites == null) {
-			var3 = class270.archive8;
-			var4 = var3.getGroupId("sl_flags");
-			var5 = var3.getFileId(var4, "");
-			var2 = FileSystem.method2628(var3, var4, var5);
-			worldSelectFlagSprites = var2;
-		}
-
-		if (ApproximateRouteStrategy.worldSelectArrows == null) {
-			var3 = class270.archive8;
-			var4 = var3.getGroupId("sl_arrows");
-			var5 = var3.getFileId(var4, "");
-			var2 = FileSystem.method2628(var3, var4, var5);
-			ApproximateRouteStrategy.worldSelectArrows = var2;
-		}
-
-		if (ChatChannel.worldSelectStars == null) {
-			var3 = class270.archive8;
-			var4 = var3.getGroupId("sl_stars");
-			var5 = var3.getFileId(var4, "");
-			var2 = FileSystem.method2628(var3, var4, var5);
-			ChatChannel.worldSelectStars = var2;
-		}
-
-		if (class137.worldSelectLeftSprite == null) {
-			class137.worldSelectLeftSprite = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "leftarrow", "");
-		}
-
-		if (BuddyRankComparator.worldSelectRightSprite == null) {
-			BuddyRankComparator.worldSelectRightSprite = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "rightarrow", "");
-		}
-
-		Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
-		Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624);
-		Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513);
-		var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
-		if (ChatChannel.worldSelectStars != null) {
-			ChatChannel.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
-			var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1);
-			ChatChannel.worldSelectStars[0].drawAt(Login.xPadding + 140, 12);
-			var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1);
-		}
-
-		if (ApproximateRouteStrategy.worldSelectArrows != null) {
-			int var22 = Login.xPadding + 280;
-			if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) {
-				ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var22, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var22, 4);
-			}
-
-			if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) {
-				ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var22 + 15, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var22 + 15, 4);
-			}
-
-			var0.draw("World", var22 + 32, 17, 16777215, -1);
-			int var23 = Login.xPadding + 390;
-			if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) {
-				ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var23, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var23, 4);
-			}
-
-			if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) {
-				ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var23 + 15, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var23 + 15, 4);
-			}
-
-			var0.draw("Players", var23 + 32, 17, 16777215, -1);
-			var4 = Login.xPadding + 500;
-			if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) {
-				ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var4, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var4, 4);
-			}
-
-			if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) {
-				ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var4 + 15, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var4 + 15, 4);
-			}
-
-			var0.draw("Location", var4 + 32, 17, 16777215, -1);
-			var5 = Login.xPadding + 610;
-			if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) {
-				ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var5, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var5, 4);
-			}
-
-			if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) {
-				ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var5 + 15, 4);
-			} else {
-				ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var5 + 15, 4);
-			}
-
-			var0.draw("Type", var5 + 32, 17, 16777215, -1);
-		}
-
-		Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0);
-		var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1);
-		Login.hoveredWorldIndex = -1;
-		if (WorldMapAreaData.worldSelectBackSprites != null) {
-			byte var26 = 88;
-			byte var27 = 19;
-			var4 = 765 / (var26 + 1) - 1;
-			var5 = 480 / (var27 + 1);
-
-			int var6;
-			int var7;
-			do {
-				var6 = var5;
-				var7 = var4;
-				if (var5 * (var4 - 1) >= World.World_count) {
-					--var4;
-				}
-
-				if (var4 * (var5 - 1) >= World.World_count) {
-					--var5;
-				}
-
-				if (var4 * (var5 - 1) >= World.World_count) {
-					--var5;
-				}
-			} while(var5 != var6 || var4 != var7);
-
-			var6 = (765 - var26 * var4) / (var4 + 1);
-			if (var6 > 5) {
-				var6 = 5;
-			}
-
-			var7 = (480 - var27 * var5) / (var5 + 1);
-			if (var7 > 5) {
-				var7 = 5;
-			}
-
-			int var8 = (765 - var26 * var4 - var6 * (var4 - 1)) / 2;
-			int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2;
-			int var10 = (var5 + World.World_count - 1) / var5;
-			Login.worldSelectPagesCount = var10 - var4;
-			if (class137.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
-				class137.worldSelectLeftSprite.drawAt(8, Client.canvasHeight / 2 - class137.worldSelectLeftSprite.subHeight / 2);
-			}
-
-			if (BuddyRankComparator.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
-				BuddyRankComparator.worldSelectRightSprite.drawAt(MouseRecorder.canvasWidth - BuddyRankComparator.worldSelectRightSprite.subWidth - 8, Client.canvasHeight / 2 - BuddyRankComparator.worldSelectRightSprite.subHeight / 2);
-			}
-
-			int var11 = var9 + 23;
-			int var12 = var8 + Login.xPadding;
-			int var13 = 0;
-			boolean var14 = false;
-			int var15 = Login.worldSelectPage;
-
-			int var16;
-			for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) {
-				World var17 = class15.World_worlds[var16];
-				boolean var18 = true;
-				String var19 = Integer.toString(var17.population);
-				if (var17.population == -1) {
-					var19 = "OFF";
-					var18 = false;
-				} else if (var17.population > 1980) {
-					var19 = "FULL";
-					var18 = false;
-				}
-
-				int var21 = 0;
-				byte var20;
-				if (var17.isBeta()) {
-					if (var17.isMembersOnly()) {
-						var20 = 7;
-					} else {
-						var20 = 6;
-					}
-				} else if (var17.isDeadman()) {
-					var21 = 16711680;
-					if (var17.isMembersOnly()) {
-						var20 = 5;
-					} else {
-						var20 = 4;
-					}
-				} else if (var17.method1408()) {
-					if (var17.isMembersOnly()) {
-						var20 = 9;
-					} else {
-						var20 = 8;
-					}
-				} else if (var17.isPvp()) {
-					if (var17.isMembersOnly()) {
-						var20 = 3;
-					} else {
-						var20 = 2;
-					}
-				} else if (var17.isMembersOnly()) {
-					var20 = 1;
-				} else {
-					var20 = 0;
-				}
-
-				if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var26 && MouseHandler.MouseHandler_y < var27 + var11 && var18) {
-					Login.hoveredWorldIndex = var16;
-					WorldMapAreaData.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215);
-					var14 = true;
-				} else {
-					WorldMapAreaData.worldSelectBackSprites[var20].drawAt(var12, var11);
-				}
-
-				if (worldSelectFlagSprites != null) {
-					worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11);
-				}
-
-				var0.drawCentered(Integer.toString(var17.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1);
-				var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1);
-				var11 = var11 + var27 + var7;
-				++var13;
-				if (var13 >= var5) {
-					var11 = var9 + 23;
-					var12 = var12 + var6 + var26;
-					var13 = 0;
-					++var15;
-				}
-			}
-
-			if (var14) {
-				var16 = var1.stringWidth(class15.World_worlds[Login.hoveredWorldIndex].activity) + 6;
-				int var24 = var1.ascent + 8;
-				int var25 = MouseHandler.MouseHandler_y + 25;
-				if (var24 + var25 > 480) {
-					var25 = MouseHandler.MouseHandler_y - 25 - var24;
-				}
-
-				Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 16777120);
-				Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 0);
-				var1.drawCentered(class15.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1);
-			}
-		}
-
-		class263.rasterProvider.drawFull(0, 0);
-	}
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-1426148283"
-	)
-	static final int method1638(int var0, int var1) {
-		if (var0 == -2) {
-			return 12345678;
-		} else if (var0 == -1) {
-			if (var1 < 2) {
-				var1 = 2;
-			} else if (var1 > 126) {
-				var1 = 126;
-			}
-
-			return var1;
-		} else {
-			var1 = (var0 & 127) * var1 / 128;
-			if (var1 < 2) {
-				var1 = 2;
-			} else if (var1 > 126) {
-				var1 = 126;
-			}
-
-			return (var0 & 65408) + var1;
+			return 0;
 		}
 	}
 }

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

@@ -3,34 +3,40 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bh")
+@ObfuscatedName("cv")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("dz")
 	@ObfuscatedSignature(
-		descriptor = "Leb;"
+		descriptor = "Led;"
+	)
+	@Export("js5SocketTask")
+	static Task js5SocketTask;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lft;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkz;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		descriptor = "(Leb;)V"
+		descriptor = "(Lft;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-1687472084"
+		garbageValue = "-1738206630"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -63,10 +69,10 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lbz;",
-		garbageValue = "93"
+		descriptor = "(II)Lcc;",
+		garbageValue = "1300102488"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -77,7 +83,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();
@@ -88,69 +94,27 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-27"
+		descriptor = "(I)Z",
+		garbageValue = "-1972373384"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method5383();
+		return this.updates.method5517();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-971711054"
+		descriptor = "(II)I",
+		garbageValue = "-952267390"
 	)
-	static String method1945(int var0) {
-		return "<img=" + var0 + ">";
-	}
-
-	@ObfuscatedName("jy")
-	@ObfuscatedSignature(
-		descriptor = "([Lio;II)V",
-		garbageValue = "-166878609"
-	)
-	@Export("runComponentCloseListeners")
-	static final void runComponentCloseListeners(Widget[] var0, int var1) {
-		for (int var2 = 0; var2 < var0.length; ++var2) {
-			Widget var3 = var0[var2];
-			if (var3 != null) {
-				if (var3.type == 0) {
-					if (var3.children != null) {
-						runComponentCloseListeners(var3.children, var1);
-					}
-
-					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
-					if (var4 != null) {
-						WorldMapData_0.runIntfCloseListeners(var4.group, var1);
-					}
-				}
-
-				ScriptEvent var5;
-				if (var1 == 0 && var3.onDialogAbort != null) {
-					var5 = new ScriptEvent();
-					var5.widget = var3;
-					var5.args = var3.onDialogAbort;
-					UserComparator10.runScriptEvent(var5);
-				}
-
-				if (var1 == 1 && var3.onSubChange != null) {
-					if (var3.childIndex >= 0) {
-						Widget var6 = UrlRequester.getWidget(var3.id);
-						if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) {
-							continue;
-						}
-					}
-
-					var5 = new ScriptEvent();
-					var5.widget = var3;
-					var5.args = var3.onSubChange;
-					UserComparator10.runScriptEvent(var5);
-				}
-			}
-		}
-
+	public static int method2205(int var0) {
+		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765);
+		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459);
+		var0 = var0 + (var0 >>> 4) & 252645135;
+		var0 += var0 >>> 8;
+		var0 += var0 >>> 16;
+		return var0 & 255;
 	}
 }

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

@@ -4,82 +4,93 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eb")
+@ObfuscatedName("ft")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
+	)
+	@Export("HealthBarDefinition_archive")
+	static AbstractArchive HealthBarDefinition_archive;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lkk;"
 	)
 	@Export("HitSplatDefinition_spritesArchive")
 	static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("HealthBarDefinition_cached")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("l")
+	@ObfuscatedName("gj")
 	@ObfuscatedGetter(
-		intValue = 1095688779
+		longValue = -8980886383990027525L
 	)
-	public int field1578;
-	@ObfuscatedName("f")
+	static long field1681;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 888679261
+		intValue = 933389157
+	)
+	public int field1670;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -358658515
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1338315527
+		intValue = -2089229871
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1826410989
+		intValue = -860787199
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1303491697
+		intValue = -1783319749
 	)
-	public int field1585;
-	@ObfuscatedName("p")
+	public int field1675;
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1768192547
+		intValue = -391654511
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1284114831
+		intValue = 690526725
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1888620897
+		intValue = 572887043
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 384103279
+		intValue = -643051501
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1942526605
+		intValue = 505163947
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -93,7 +104,7 @@ public class HealthBarDefinition extends DualNode {
 		this.int1 = 255;
 		this.int2 = 255;
 		this.int3 = -1;
-		this.field1585 = 1;
+		this.field1675 = 1;
 		this.int5 = 70;
 		this.frontSpriteID = -1;
 		this.backSpriteID = -1;
@@ -101,10 +112,10 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;I)V",
-		garbageValue = "-1663696297"
+		descriptor = "(Lot;I)V",
+		garbageValue = "1763232152"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -118,10 +129,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "-1852726856"
+		descriptor = "(Lot;IB)V",
+		garbageValue = "-37"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -138,9 +149,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method6674();
+			this.frontSpriteID = var1.method6985();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method6674();
+			this.backSpriteID = var1.method6985();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -151,10 +162,10 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lom;",
-		garbageValue = "103"
+		descriptor = "(I)Loc;",
+		garbageValue = "2090107187"
 	)
 	@Export("getFrontSprite")
 	public SpritePixels getFrontSprite() {
@@ -165,7 +176,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ViewportMouse.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = class258.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
@@ -175,10 +186,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lom;",
-		garbageValue = "389239456"
+		descriptor = "(I)Loc;",
+		garbageValue = "-1821086561"
 	)
 	@Export("getBackSprite")
 	public SpritePixels getBackSprite() {
@@ -189,7 +200,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ViewportMouse.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = class258.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
@@ -199,61 +210,18 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "2134650169"
+		descriptor = "(I)[Lip;",
+		garbageValue = "-1012659579"
 	)
-	static int method2798(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == 3500) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method2417(var3) ? 1 : 0;
-			return 1;
-		} else if (var0 == 3501) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class267.method4922(var3) ? 1 : 0;
-			return 1;
-		} else if (var0 == 3502) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class120.method2484(var3) ? 1 : 0;
-			return 1;
-		} else {
-			return 2;
-		}
+	public static class240[] method2890() {
+		return new class240[]{class240.field2755, class240.field2749, class240.field2751, class240.field2752, class240.field2753, class240.field2760, class240.field2750, class240.field2756, class240.field2757, class240.field2758};
 	}
 
-	@ObfuscatedName("jr")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;B)Z",
-		garbageValue = "2"
-	)
-	@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 = JagexCache.method2617(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 (var2 == var3) {
-						return false;
-					}
-				} else if (var3 != var2) {
-					return false;
-				}
-			}
-
-			return true;
-		}
+	@ObfuscatedName("a")
+	@Export("Entity_unpackID")
+	public static int Entity_unpackID(long var0) {
+		return (int)(var0 >>> 17 & 4294967295L);
 	}
 }

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

@@ -1,33 +1,41 @@
+import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bz")
+@ObfuscatedName("cc")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("s")
+	@ObfuscatedName("td")
 	@ObfuscatedGetter(
-		intValue = 1564822049
+		intValue = -1732657831
+	)
+	@Export("foundItemIdCount")
+	static int foundItemIdCount;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -901271755
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 396108399
+		intValue = -317308411
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1574607109
+		intValue = 1457157311
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1966461257
+		intValue = 1509184493
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -39,10 +47,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "1017297352"
+		garbageValue = "-1706471519"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -52,25 +60,174 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lei;",
-		garbageValue = "-1737036949"
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "-125"
 	)
-	@Export("WorldMapElement_get")
-	public static WorldMapElement WorldMapElement_get(int var0) {
-		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0);
+	static int method2142(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]);
+		} else {
+			var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget;
+		}
+
+		Actor.invalidateWidget(var3);
+		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) {
+			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) {
+				var3.modelType = 2;
+				var3.modelId = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) {
+				var3.modelType = 3;
+				var3.modelId = class129.localPlayer.appearance.getChatHeadId();
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			class240.Interpreter_intStackSize -= 2;
+			int var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize];
+			int var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1];
+			var3.itemId = var4;
+			var3.itemQuantity = var5;
+			ItemComposition var6 = class65.ItemDefinition_get(var4);
+			var3.modelAngleX = var6.xan2d;
+			var3.modelAngleY = var6.yan2d;
+			var3.modelAngleZ = var6.zan2d;
+			var3.modelOffsetX = var6.offsetX2d;
+			var3.modelOffsetY = var6.offsetY2d;
+			var3.modelZoom = var6.zoom2d;
+			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
+				var3.itemQuantityMode = 0;
+			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) {
+				var3.itemQuantityMode = 1;
+			} else {
+				var3.itemQuantityMode = 2;
+			}
+
+			if (var3.field3089 > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.field3089;
+			} else if (var3.rawWidth > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
+			}
+
+			return 1;
+		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("ed")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "-1474231876"
+		descriptor = "(IB)V",
+		garbageValue = "63"
 	)
-	public static int method1894(int var0, int var1, int var2) {
-		int var3 = class118.method2461(var2 - var1 + 1);
-		var3 <<= var1;
-		var0 |= var3;
-		return var0;
+	@Export("updateGameState")
+	static void updateGameState(int var0) {
+		if (var0 != Client.gameState) {
+			if (Client.gameState == 0) {
+				ArchiveDiskActionHandler.client.method465();
+			}
+
+			if (var0 == 20 || var0 == 40 || var0 == 45) {
+				class135.method2672(0);
+				Client.field546 = 0;
+				Client.field516 = 0;
+				Client.timer.method5827(var0);
+				if (var0 != 20) {
+					Varcs.method2303(false);
+				}
+			}
+
+			if (var0 != 20 && var0 != 40 && NetCache.field3738 != null) {
+				NetCache.field3738.close();
+				NetCache.field3738 = null;
+			}
+
+			if (Client.gameState == 25) {
+				Client.field545 = 0;
+				Client.field639 = 0;
+				Client.field656 = 1;
+				Client.field641 = 0;
+				Client.field544 = 1;
+			}
+
+			int var1;
+			if (var0 != 5 && var0 != 10) {
+				if (var0 == 20) {
+					var1 = Client.gameState == 11 ? 4 : 0;
+					class184.method3725(MouseRecorder.archive10, World.archive8, true, var1);
+				} else if (var0 == 11) {
+					class184.method3725(MouseRecorder.archive10, World.archive8, false, 4);
+				} else if (Login.clearLoginScreen) {
+					Login.titleboxSprite = null;
+					Login.titlebuttonSprite = null;
+					Login.runesSprite = null;
+					class318.leftTitleSprite = null;
+					Login.rightTitleSprite = null;
+					class394.logoSprite = null;
+					class92.title_muteSprite = null;
+					ModelData0.options_buttons_0Sprite = null;
+					Client.options_buttons_2Sprite = null;
+					DevicePcmPlayerProvider.worldSelectBackSprites = null;
+					WorldMapSection1.worldSelectFlagSprites = null;
+					World.worldSelectArrows = null;
+					class7.worldSelectStars = null;
+					class275.field3281 = null;
+					Login.loginScreenRunesAnimation.method2151();
+					class16.method218(2);
+					if (NetCache.NetCache_socket != null) {
+						try {
+							Buffer var3 = new Buffer(4);
+							var3.writeByte(2);
+							var3.writeMedium(0);
+							NetCache.NetCache_socket.write(var3.array, 0, 4);
+						} catch (IOException var5) {
+							try {
+								NetCache.NetCache_socket.close();
+							} catch (Exception var4) {
+							}
+
+							++NetCache.NetCache_ioExceptions;
+							NetCache.NetCache_socket = null;
+						}
+					}
+
+					Login.clearLoginScreen = false;
+				}
+			} else {
+				var1 = WorldMapAreaData.method3903() ? 0 : 12;
+				class184.method3725(MouseRecorder.archive10, World.archive8, true, var1);
+			}
+
+			Client.gameState = var0;
+		}
+	}
+
+	@ObfuscatedName("ff")
+	@ObfuscatedSignature(
+		descriptor = "(Lfa;IIII)V",
+		garbageValue = "1416325930"
+	)
+	static void method2148(SequenceDefinition var0, int var1, int var2, int var3) {
+		if (Client.soundEffectCount < 50 && VarbitComposition.clientPreferences.areaSoundEffectsVolume != 0) {
+			if (var0.soundEffects != null && var1 < var0.soundEffects.length) {
+				int var4 = var0.soundEffects[var1];
+				if (var4 != 0) {
+					int var5 = var4 >> 8;
+					int var6 = var4 >> 4 & 7;
+					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;
+				}
+			}
+		}
 	}
 }

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

@@ -4,120 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("es")
+@ObfuscatedName("fe")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("rw")
-	@ObfuscatedGetter(
-		intValue = 1601554383
-	)
-	static int field1713;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
 	@Export("HitSplatDefinition_archive")
 	static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljy;"
+		descriptor = "Lkk;"
 	)
-	@Export("HitSplatDefinition_fontsArchive")
-	static AbstractArchive HitSplatDefinition_fontsArchive;
-	@ObfuscatedName("j")
+	static AbstractArchive field1797;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("HitSplatDefinition_cached")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lhw;"
+		descriptor = "Lim;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 411738229
+		intValue = 1133546297
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 258226795
+		intValue = -274265119
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 162491923
+		intValue = -1756131241
 	)
-	public int field1716;
-	@ObfuscatedName("a")
+	public int field1804;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1731798421
+		intValue = 1463385181
 	)
-	int field1717;
-	@ObfuscatedName("q")
+	int field1800;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -687229769
+		intValue = 337855297
 	)
-	int field1720;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1240611547
-	)
-	int field1719;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -670431333
-	)
-	int field1718;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -1031558843
-	)
-	public int field1721;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1977484367
-	)
-	public int field1722;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = -148229729
-	)
-	public int field1706;
-	@ObfuscatedName("b")
-	String field1724;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 1909368231
-	)
-	public int field1725;
+	int field1806;
 	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1197229655
+		intValue = -1116832275
 	)
-	public int field1726;
-	@ObfuscatedName("y")
+	int field1814;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = 18132261
+	)
+	int field1808;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -1398460241
+	)
+	public int field1809;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -1600829023
+	)
+	public int field1810;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 1648565925
+	)
+	public int field1811;
+	@ObfuscatedName("t")
+	String field1812;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 235922287
+	)
+	public int field1813;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 1798400573
+	)
+	public int field1817;
+	@ObfuscatedName("w")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -707974113
+		intValue = 1583927141
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -673375799
+		intValue = -1197970835
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -131,25 +125,25 @@ public class HitSplatDefinition extends DualNode {
 	HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field1716 = 70;
-		this.field1717 = -1;
-		this.field1720 = -1;
-		this.field1719 = -1;
-		this.field1718 = -1;
-		this.field1721 = 0;
-		this.field1722 = 0;
-		this.field1706 = -1;
-		this.field1724 = "";
-		this.field1725 = -1;
-		this.field1726 = 0;
+		this.field1804 = 70;
+		this.field1800 = -1;
+		this.field1806 = -1;
+		this.field1814 = -1;
+		this.field1808 = -1;
+		this.field1809 = 0;
+		this.field1810 = 0;
+		this.field1811 = -1;
+		this.field1812 = "";
+		this.field1813 = -1;
+		this.field1817 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;I)V",
-		garbageValue = "992937334"
+		descriptor = "(Lot;I)V",
+		garbageValue = "-1268103481"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -163,41 +157,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "144346720"
+		descriptor = "(Lot;II)V",
+		garbageValue = "1356754774"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method6674();
+			this.fontId = var1.method6985();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field1717 = var1.method6674();
+			this.field1800 = var1.method6985();
 		} else if (var2 == 4) {
-			this.field1719 = var1.method6674();
+			this.field1814 = var1.method6985();
 		} else if (var2 == 5) {
-			this.field1720 = var1.method6674();
+			this.field1806 = var1.method6985();
 		} else if (var2 == 6) {
-			this.field1718 = var1.method6674();
+			this.field1808 = var1.method6985();
 		} else if (var2 == 7) {
-			this.field1721 = var1.readShort();
+			this.field1809 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field1724 = var1.readStringCp1252NullCircumfixed();
+			this.field1812 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field1716 = var1.readUnsignedShort();
+			this.field1804 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field1722 = var1.readShort();
+			this.field1810 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field1706 = 0;
+			this.field1811 = 0;
 		} else if (var2 == 12) {
-			this.field1725 = var1.readUnsignedByte();
+			this.field1813 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field1726 = var1.readShort();
+			this.field1817 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field1706 = var1.readUnsignedShort();
+			this.field1811 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -232,16 +226,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Les;",
-		garbageValue = "-1548593405"
+		descriptor = "(B)Lfe;",
+		garbageValue = "12"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = WorldMapSection0.getVarbit(this.transformVarbit);
+			var1 = class247.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -253,17 +247,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? ObjectComposition.method3044(var2) : null;
+		return var2 != -1 ? PendingSpawn.method2120(var2) : null;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "991764239"
+		garbageValue = "-75134339"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field1724;
+		String var2 = this.field1812;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -271,26 +265,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + MusicPatchNode.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + EnumComposition.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lom;",
-		garbageValue = "2141708978"
+		descriptor = "(B)Loc;",
+		garbageValue = "124"
 	)
-	public SpritePixels method2970() {
-		if (this.field1717 < 0) {
+	public SpritePixels method3091() {
+		if (this.field1800 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1717);
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1800);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1717, 0);
+				var1 = class258.SpriteBuffer_getSprite(field1797, this.field1800, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1717);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1800);
 				}
 
 				return var1;
@@ -298,22 +292,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lom;",
-		garbageValue = "-5"
+		descriptor = "(I)Loc;",
+		garbageValue = "-1897521484"
 	)
-	public SpritePixels method2960() {
-		if (this.field1720 < 0) {
+	public SpritePixels method3121() {
+		if (this.field1806 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1720);
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1806);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1720, 0);
+				var1 = class258.SpriteBuffer_getSprite(field1797, this.field1806, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1720);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1806);
 				}
 
 				return var1;
@@ -321,22 +315,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lom;",
-		garbageValue = "-890691987"
+		descriptor = "(I)Loc;",
+		garbageValue = "1980072037"
 	)
-	public SpritePixels method2961() {
-		if (this.field1719 < 0) {
+	public SpritePixels method3122() {
+		if (this.field1814 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1719);
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1814);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1719, 0);
+				var1 = class258.SpriteBuffer_getSprite(field1797, this.field1814, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1719);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1814);
 				}
 
 				return var1;
@@ -344,22 +338,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lom;",
-		garbageValue = "-104"
+		descriptor = "(S)Loc;",
+		garbageValue = "18912"
 	)
-	public SpritePixels method2962() {
-		if (this.field1718 < 0) {
+	public SpritePixels method3107() {
+		if (this.field1808 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1718);
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1808);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1718, 0);
+				var1 = class258.SpriteBuffer_getSprite(field1797, this.field1808, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1718);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1808);
 				}
 
 				return var1;
@@ -367,10 +361,10 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lkt;",
-		garbageValue = "1025238458"
+		descriptor = "(B)Llu;",
+		garbageValue = "-96"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -381,7 +375,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class251.method4840(class163.field1913, HitSplatDefinition_fontsArchive, this.fontId, 0);
+				var1 = AbstractSocket.method6107(field1797, class245.HitSplatDefinition_fontsArchive, this.fontId, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
 				}
@@ -391,31 +385,80 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)J",
-		garbageValue = "-1512777852"
+		descriptor = "(IB)Lff;",
+		garbageValue = "28"
 	)
-	static long method2988(int var0, int var1, int var2) {
-		return (long)(var2 << 16 | var0 << 8 | var1);
+	@Export("getObjectDefinition")
+	public static ObjectComposition getObjectDefinition(int var0) {
+		ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0);
+			var1 = new ObjectComposition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			if (var1.isSolid) {
+				var1.interactType = 0;
+				var1.boolean1 = false;
+			}
+
+			ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
 	}
 
-	@ObfuscatedName("lr")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "172246338"
+		garbageValue = "153503644"
 	)
-	static void method2981() {
-		if (class367.field4127 != null) {
-			Client.field679 = Client.cycle;
-			class367.field4127.method5183();
-
-			for (int var0 = 0; var0 < Client.players.length; ++var0) {
-				if (Client.players[var0] != null) {
-					class367.field4127.method5182((Client.players[var0].x >> 7) + GrandExchangeOfferNameComparator.baseX, (Client.players[var0].y >> 7) + NPC.baseY);
-				}
+	public static void method3115() {
+		if (KeyHandler.KeyHandler_instance != null) {
+			synchronized(KeyHandler.KeyHandler_instance) {
+				KeyHandler.KeyHandler_instance = null;
 			}
 		}
 
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(CI)C",
+		garbageValue = "-836457989"
+	)
+	static char method3123(char var0) {
+		if (var0 == 198) {
+			return 'E';
+		} else if (var0 == 230) {
+			return 'e';
+		} else if (var0 == 223) {
+			return 's';
+		} else if (var0 == 338) {
+			return 'E';
+		} else {
+			return (char)(var0 == 339 ? 'e' : '\u0000');
+		}
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(CI)Z",
+		garbageValue = "1906173449"
+	)
+	static boolean method3108(char var0) {
+		for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) {
+			if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

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

@@ -4,49 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eh")
+@ObfuscatedName("fs")
 @Implements("HorizontalAlignment")
-public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("s")
+public enum HorizontalAlignment implements MouseWheel {
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Lfs;"
 	)
-	field1612(2, 0),
-	@ObfuscatedName("t")
+	field1697(0, 0),
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Lfs;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(0, 1),
-	@ObfuscatedName("v")
+	HorizontalAlignment_centered(1, 1),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Lfs;"
 	)
-	field1608(1, 2);
+	field1699(2, 2);
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 408090273
-	)
-	@Export("musicTrackVolume")
-	public static int musicTrackVolume;
-	@ObfuscatedName("bt")
-	@Export("otp")
-	static String otp;
-	@ObfuscatedName("dm")
-	@ObfuscatedGetter(
-		longValue = 2624473618268498173L
-	)
-	static long field1609;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -1196948591
+		intValue = 514684703
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -491897209
+		intValue = 1489596043
 	)
 	@Export("id")
 	final int id;
@@ -56,22 +42,63 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1806959663"
+		garbageValue = "-1665712539"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1899123482"
+		descriptor = "(I)[Lfc;",
+		garbageValue = "164653806"
 	)
-	public static boolean method2816(int var0) {
-		return (var0 >> 28 & 1) != 0;
+	static VerticalAlignment[] method2943() {
+		return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1741, VerticalAlignment.field1746};
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1870889270"
+	)
+	public static void method2949() {
+		class54.reflectionChecks = new IterableNodeDeque();
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfz;",
+		garbageValue = "2060571057"
+	)
+	@Export("StructDefinition_getStructDefinition")
+	public static StructComposition StructDefinition_getStructDefinition(int var0) {
+		StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0);
+			var1 = new StructComposition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			StructComposition.StructDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("gw")
+	@ObfuscatedSignature(
+		descriptor = "(Lcf;II)V",
+		garbageValue = "-1815882612"
+	)
+	static final void method2947(Actor var0, int var1) {
+		Login.worldToScreen(var0.x, var0.y, var1);
 	}
 }

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

@@ -3,21 +3,19 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ie")
+@ObfuscatedName("jc")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("f")
-	static byte[][][] field3113;
-	@ObfuscatedName("gz")
-	@Export("regionMapArchiveIds")
-	static int[] regionMapArchiveIds;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
+	@Export("ItemDefinition_inMembersWorld")
+	public static boolean ItemDefinition_inMembersWorld;
+	@ObfuscatedName("n")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("keys")
 	int[] keys;
 
@@ -46,7 +44,7 @@ public class Huffman {
 
 					for (var10 = var6 - 1; var10 >= 1; --var10) {
 						var11 = var3[var10];
-						if (var11 != var8) {
+						if (var8 != var11) {
 							break;
 						}
 
@@ -104,10 +102,10 @@ public class Huffman {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "([BII[BII)I",
-		garbageValue = "-2001454460"
+		garbageValue = "743911469"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -125,7 +123,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) {
@@ -155,10 +153,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "([BI[BIII)I",
-		garbageValue = "-2100484345"
+		garbageValue = "141033837"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -299,74 +297,97 @@ public class Huffman {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "([Lkf;II)Lkf;",
-		garbageValue = "-498785884"
+		descriptor = "(Ljc;B)V",
+		garbageValue = "-78"
 	)
-	@Export("findEnumerated")
-	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-		Enumerated[] var2 = var0;
-
-		for (int var3 = 0; var3 < var2.length; ++var3) {
-			Enumerated var4 = var2[var3];
-			if (var1 == var4.rsOrdinal()) {
-				return var4;
-			}
-		}
-
-		return null;
+	public static void method5007(Huffman var0) {
+		class264.huffman = var0;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("hy")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-69"
+		descriptor = "(ZLoq;I)V",
+		garbageValue = "-1535090949"
 	)
-	@Export("loadInterface")
-	public static boolean loadInterface(int var0) {
-		if (class100.Widget_loadedInterfaces[var0]) {
-			return true;
-		} else if (!Widget.Widget_archive.tryLoadGroup(var0)) {
-			return false;
-		} else {
-			int var1 = Widget.Widget_archive.getGroupFileCount(var0);
-			if (var1 == 0) {
-				class100.Widget_loadedInterfaces[var0] = true;
-				return true;
-			} else {
-				if (Widget.Widget_interfaceComponents[var0] == null) {
-					Widget.Widget_interfaceComponents[var0] = new Widget[var1];
-				}
+	static final void method5011(boolean var0, PacketBuffer var1) {
+		while (true) {
+			if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
+				int var2 = var1.readBits(15);
+				if (var2 != 32767) {
+					boolean var3 = false;
+					if (Client.npcs[var2] == null) {
+						Client.npcs[var2] = new NPC();
+						var3 = true;
+					}
 
-				for (int var2 = 0; var2 < var1; ++var2) {
-					if (Widget.Widget_interfaceComponents[var0][var2] == null) {
-						byte[] var3 = Widget.Widget_archive.takeFile(var0, var2);
-						if (var3 != null) {
-							Widget.Widget_interfaceComponents[var0][var2] = new Widget();
-							Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16);
-							if (var3[0] == -1) {
-								Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
-							} else {
-								Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3));
-							}
+					NPC var4 = Client.npcs[var2];
+					Client.npcIndices[++Client.npcCount - 1] = var2;
+					var4.npcCycle = Client.cycle;
+					int var6;
+					if (var0) {
+						var6 = var1.readBits(8);
+						if (var6 > 127) {
+							var6 -= 256;
+						}
+					} else {
+						var6 = var1.readBits(5);
+						if (var6 > 15) {
+							var6 -= 32;
 						}
 					}
-				}
 
-				class100.Widget_loadedInterfaces[var0] = true;
-				return true;
+					int var8 = Client.defaultRotations[var1.readBits(3)];
+					if (var3) {
+						var4.orientation = var4.rotation = var8;
+					}
+
+					int var5 = var1.readBits(1);
+					int var9 = var1.readBits(1);
+					if (var9 == 1) {
+						Client.field533[++Client.field560 - 1] = var2;
+					}
+
+					int var7;
+					if (var0) {
+						var7 = var1.readBits(8);
+						if (var7 > 127) {
+							var7 -= 256;
+						}
+					} else {
+						var7 = var1.readBits(5);
+						if (var7 > 15) {
+							var7 -= 32;
+						}
+					}
+
+					var4.definition = ScriptEvent.getNpcDefinition(var1.readBits(14));
+					boolean var10 = var1.readBits(1) == 1;
+					if (var10) {
+						var1.readBits(32);
+					}
+
+					var4.field1137 = var4.definition.size;
+					var4.field1146 = var4.definition.rotation;
+					if (var4.field1146 == 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.method2224(class129.localPlayer.pathX[0] + var6, class129.localPlayer.pathY[0] + var7, var5 == 1);
+					continue;
+				}
 			}
+
+			var1.exportIndex();
+			return;
 		}
 	}
-
-	@ObfuscatedName("ec")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "311556641"
-	)
-	static final void method4834() {
-		Scene.Scene_isLowDetail = false;
-		Client.isLowDetail = false;
-	}
 }

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

@@ -1,12 +1,18 @@
 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("lu")
+@ObfuscatedName("lw")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("v")
+	@ObfuscatedName("sg")
+	@ObfuscatedGetter(
+		intValue = 1060478283
+	)
+	static int field3918;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "Lnf;"
 	)
@@ -21,30 +27,30 @@ public class IgnoreList extends UserList {
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llm;",
-		garbageValue = "-70"
+		descriptor = "(B)Lle;",
+		garbageValue = "27"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llm;",
-		garbageValue = "-2047984332"
+		descriptor = "(II)[Lle;",
+		garbageValue = "-1704587572"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V",
-		garbageValue = "541103993"
+		descriptor = "(Lot;IB)V",
+		garbageValue = "6"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -88,22 +94,761 @@ public class IgnoreList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("hv")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1517650205"
+		descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V",
+		garbageValue = "-29"
 	)
-	@Export("isKeyDown")
-	public static final boolean isKeyDown() {
-		synchronized(KeyHandler.KeyHandler_instance) {
-			if (KeyHandler.field59 == KeyHandler.field57) {
-				return false;
+	@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 = FriendSystem.getPacketBufferNode(ClientPacket.field2683, Client.packetWriter.isaacCipher);
+			var8.packetBuffer.writeInt(Tiles.selectedItemWidget);
+			var8.packetBuffer.writeShort(DesktopPlatformInfoProvider.selectedItemSlot);
+			var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX);
+			var8.packetBuffer.writeShort(class320.baseY + var1);
+			var8.packetBuffer.writeShort(var3);
+			var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+			var8.packetBuffer.writeShort(class92.selectedItemId);
+			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 = FriendSystem.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher);
+			var8.packetBuffer.method6852(var3);
+			var8.packetBuffer.writeShort(class320.baseY + var1);
+			var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX);
+			var8.packetBuffer.method6951(Client.selectedSpellChildIndex);
+			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+			var8.packetBuffer.method6951(Client.field645);
+			var8.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget);
+			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 = FriendSystem.getPacketBufferNode(ClientPacket.field2709, Client.packetWriter.isaacCipher);
+			var8.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+			var8.packetBuffer.method6851(var0 + FloorOverlayDefinition.baseX);
+			var8.packetBuffer.method6951(class320.baseY + var1);
+			var8.packetBuffer.writeShort(var3);
+			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 = FriendSystem.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher);
+			var8.packetBuffer.method6951(var3);
+			var8.packetBuffer.method6851(class320.baseY + var1);
+			var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX);
+			var8.packetBuffer.method6841(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2732, Client.packetWriter.isaacCipher);
+			var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+			var8.packetBuffer.method6852(var3);
+			var8.packetBuffer.method6852(class320.baseY + var1);
+			var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX);
+			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 = FriendSystem.getPacketBufferNode(ClientPacket.field2710, Client.packetWriter.isaacCipher);
+			var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX);
+			var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+			var8.packetBuffer.method6951(var3);
+			var8.packetBuffer.method6851(class320.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 = FriendSystem.getPacketBufferNode(ClientPacket.field2680, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.writeShort(var3);
+					var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var9.packetBuffer.method6852(class92.selectedItemId);
+					var9.packetBuffer.method6861(Tiles.selectedItemWidget);
+					var9.packetBuffer.method6852(DesktopPlatformInfoProvider.selectedItemSlot);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2743, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.writeIntME(WorldMapEvent.selectedSpellWidget);
+					var9.packetBuffer.method6851(var3);
+					var9.packetBuffer.method6851(Client.field645);
+					var9.packetBuffer.writeShort(Client.selectedSpellChildIndex);
+					var9.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2706, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var9.packetBuffer.method6951(var3);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2728, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.writeShort(var3);
+					var9.packetBuffer.method6843(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.method6951(var3);
+					var9.packetBuffer.writeByte(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var9.packetBuffer.writeShort(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher);
+					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var9.packetBuffer.method6851(var3);
+					Client.packetWriter.addNode(var9);
+				}
 			} else {
-				class120.field1417 = KeyHandler.field54[KeyHandler.field57];
-				class126.field1449 = KeyHandler.field51[KeyHandler.field57];
-				KeyHandler.field57 = KeyHandler.field57 + 1 & 127;
-				return true;
+				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 = FriendSystem.getPacketBufferNode(ClientPacket.field2693, Client.packetWriter.isaacCipher);
+						var9.packetBuffer.method6951(var3);
+						var9.packetBuffer.writeShort(DesktopPlatformInfoProvider.selectedItemSlot);
+						var9.packetBuffer.method6851(class92.selectedItemId);
+						var9.packetBuffer.writeIntME(Tiles.selectedItemWidget);
+						var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+						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 = FriendSystem.getPacketBufferNode(ClientPacket.field2685, Client.packetWriter.isaacCipher);
+						var9.packetBuffer.writeShort(Client.field645);
+						var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+						var9.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget);
+						var9.packetBuffer.method6852(Client.selectedSpellChildIndex);
+						var9.packetBuffer.writeShort(var3);
+						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 = FriendSystem.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6951(class320.baseY + var1);
+					var8.packetBuffer.method6861(Tiles.selectedItemWidget);
+					var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX);
+					var8.packetBuffer.method6852(DesktopPlatformInfoProvider.selectedItemSlot);
+					var8.packetBuffer.method6951(var3);
+					var8.packetBuffer.writeShort(class92.selectedItemId);
+					var8.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6852(Client.selectedSpellChildIndex);
+					var8.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget);
+					var8.packetBuffer.method6951(var3);
+					var8.packetBuffer.writeShort(class320.baseY + var1);
+					var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX);
+					var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var8.packetBuffer.method6951(Client.field645);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2724, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var8.packetBuffer.method6851(class320.baseY + var1);
+					var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX);
+					var8.packetBuffer.method6851(var3);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2729, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6851(var0 + FloorOverlayDefinition.baseX);
+					var8.packetBuffer.method6951(var3);
+					var8.packetBuffer.method6852(class320.baseY + var1);
+					var8.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var8.packetBuffer.method6851(class320.baseY + var1);
+					var8.packetBuffer.method6851(var3);
+					var8.packetBuffer.writeShort(var0 + FloorOverlayDefinition.baseX);
+					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 = FriendSystem.getPacketBufferNode(ClientPacket.field2702, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX);
+					var8.packetBuffer.method6851(var3);
+					var8.packetBuffer.method6851(class320.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 = FriendSystem.getPacketBufferNode(ClientPacket.field2740, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method6951(var3);
+					var8.packetBuffer.method6851(var0 + FloorOverlayDefinition.baseX);
+					var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+					var8.packetBuffer.method6951(class320.baseY + var1);
+					Client.packetWriter.addNode(var8);
+				} else if (var2 == 23) {
+					if (Client.isMenuOpen) {
+						CollisionMap.scene.setViewportWalking();
+					} else {
+						CollisionMap.scene.menuOpen(class391.Client_plane, var0, var1, true);
+					}
+				} else {
+					PacketBufferNode var10;
+					Widget var16;
+					if (var2 == 24) {
+						var16 = class87.getWidget(var1);
+						boolean var11 = true;
+						if (var16.contentType > 0) {
+							var11 = class119.method2508(var16);
+						}
+
+						if (var11) {
+							var10 = FriendSystem.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher);
+							var10.packetBuffer.writeInt(var1);
+							Client.packetWriter.addNode(var10);
+						}
+					} else {
+						if (var2 == 25) {
+							var16 = ParamComposition.getWidgetChild(var1, var0);
+							if (var16 != null) {
+								ReflectionCheck.Widget_runOnTargetLeave();
+								DirectByteArrayCopier.selectSpell(var1, var0, class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var16)), var16.itemId);
+								Client.isItemSelected = 0;
+								Client.selectedSpellActionName = FileSystem.Widget_getSpellActionName(var16);
+								if (Client.selectedSpellActionName == null) {
+									Client.selectedSpellActionName = "null";
+								}
+
+								if (var16.isIf3) {
+									Client.selectedSpellName = var16.dataText + class54.colorStartTag(16777215);
+								} else {
+									Client.selectedSpellName = class54.colorStartTag(65280) + var16.spellName + class54.colorStartTag(16777215);
+								}
+							}
+
+							return;
+						}
+
+						if (var2 == 26) {
+							FriendsChat.method5904();
+						} else {
+							int var12;
+							Widget var14;
+							if (var2 == 28) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.writeInt(var1);
+								Client.packetWriter.addNode(var8);
+								var14 = class87.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];
+									InvDefinition.changeGameOptions(var12);
+								}
+							} else if (var2 == 29) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.writeInt(var1);
+								Client.packetWriter.addNode(var8);
+								var14 = class87.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];
+										InvDefinition.changeGameOptions(var12);
+									}
+								}
+							} else if (var2 == 30) {
+								if (Client.meslayerContinueWidget == null) {
+									DevicePcmPlayerProvider.resumePauseWidget(var1, var0);
+									Client.meslayerContinueWidget = ParamComposition.getWidgetChild(var1, var0);
+									Actor.invalidateWidget(Client.meslayerContinueWidget);
+								}
+							} else if (var2 == 31) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.method6951(var0);
+								var8.packetBuffer.method6860(var1);
+								var8.packetBuffer.method6951(class92.selectedItemId);
+								var8.packetBuffer.writeInt(Tiles.selectedItemWidget);
+								var8.packetBuffer.method6851(DesktopPlatformInfoProvider.selectedItemSlot);
+								var8.packetBuffer.method6852(var3);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else if (var2 == 32) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2745, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.writeIntME(WorldMapEvent.selectedSpellWidget);
+								var8.packetBuffer.writeShort(Client.selectedSpellChildIndex);
+								var8.packetBuffer.writeInt(var1);
+								var8.packetBuffer.method6852(var3);
+								var8.packetBuffer.method6951(var0);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else if (var2 == 33) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2708, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.writeIntME(var1);
+								var8.packetBuffer.writeShort(var3);
+								var8.packetBuffer.method6852(var0);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else if (var2 == 34) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2694, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.method6851(var0);
+								var8.packetBuffer.writeShort(var3);
+								var8.packetBuffer.writeInt(var1);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else if (var2 == 35) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2718, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.method6852(var0);
+								var8.packetBuffer.writeIntME(var1);
+								var8.packetBuffer.writeShort(var3);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else if (var2 == 36) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.writeShort(var0);
+								var8.packetBuffer.method6852(var3);
+								var8.packetBuffer.method6861(var1);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else if (var2 == 37) {
+								var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher);
+								var8.packetBuffer.writeShort(var3);
+								var8.packetBuffer.method6861(var1);
+								var8.packetBuffer.method6852(var0);
+								Client.packetWriter.addNode(var8);
+								Client.field727 = 0;
+								FriendsChat.field3934 = class87.getWidget(var1);
+								Client.field593 = var0;
+							} else {
+								if (var2 == 38) {
+									ReflectionCheck.Widget_runOnTargetLeave();
+									var16 = class87.getWidget(var1);
+									Client.isItemSelected = 1;
+									DesktopPlatformInfoProvider.selectedItemSlot = var0;
+									Tiles.selectedItemWidget = var1;
+									class92.selectedItemId = var3;
+									Actor.invalidateWidget(var16);
+									Client.selectedItemName = class54.colorStartTag(16748608) + class65.ItemDefinition_get(var3).name + class54.colorStartTag(16777215);
+									if (Client.selectedItemName == null) {
+										Client.selectedItemName = "null";
+									}
+
+									return;
+								}
+
+								if (var2 == 39) {
+									var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2682, Client.packetWriter.isaacCipher);
+									var8.packetBuffer.writeInt(var1);
+									var8.packetBuffer.method6852(var0);
+									var8.packetBuffer.writeShort(var3);
+									Client.packetWriter.addNode(var8);
+									Client.field727 = 0;
+									FriendsChat.field3934 = class87.getWidget(var1);
+									Client.field593 = var0;
+								} else if (var2 == 40) {
+									var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher);
+									var8.packetBuffer.method6951(var3);
+									var8.packetBuffer.writeInt(var1);
+									var8.packetBuffer.method6852(var0);
+									Client.packetWriter.addNode(var8);
+									Client.field727 = 0;
+									FriendsChat.field3934 = class87.getWidget(var1);
+									Client.field593 = var0;
+								} else if (var2 == 41) {
+									var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2734, Client.packetWriter.isaacCipher);
+									var8.packetBuffer.writeShort(var3);
+									var8.packetBuffer.writeShort(var0);
+									var8.packetBuffer.method6861(var1);
+									Client.packetWriter.addNode(var8);
+									Client.field727 = 0;
+									FriendsChat.field3934 = class87.getWidget(var1);
+									Client.field593 = var0;
+								} else if (var2 == 42) {
+									var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2705, Client.packetWriter.isaacCipher);
+									var8.packetBuffer.method6851(var0);
+									var8.packetBuffer.writeShort(var3);
+									var8.packetBuffer.writeIntME(var1);
+									Client.packetWriter.addNode(var8);
+									Client.field727 = 0;
+									FriendsChat.field3934 = class87.getWidget(var1);
+									Client.field593 = var0;
+								} else if (var2 == 43) {
+									var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2674, Client.packetWriter.isaacCipher);
+									var8.packetBuffer.method6851(var3);
+									var8.packetBuffer.method6860(var1);
+									var8.packetBuffer.method6851(var0);
+									Client.packetWriter.addNode(var8);
+									Client.field727 = 0;
+									FriendsChat.field3934 = class87.getWidget(var1);
+									Client.field593 = 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 = FriendSystem.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										var9.packetBuffer.method6851(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2741, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										var9.packetBuffer.method6951(var3);
+										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 = FriendSystem.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										var9.packetBuffer.method6851(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2715, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.method6851(var3);
+										var9.packetBuffer.method6819(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 = FriendSystem.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.writeShort(var3);
+										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										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 = FriendSystem.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.writeShort(var3);
+										var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										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 = FriendSystem.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.method6951(var3);
+										var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										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 = FriendSystem.getPacketBufferNode(ClientPacket.field2713, Client.packetWriter.isaacCipher);
+										var9.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										var9.packetBuffer.method6951(var3);
+										Client.packetWriter.addNode(var9);
+									}
+								} else if (var2 != 57 && var2 != 1007) {
+									if (var2 == 58) {
+										var16 = ParamComposition.getWidgetChild(var1, var0);
+										if (var16 != null) {
+											var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher);
+											var9.packetBuffer.method6951(var16.itemId);
+											var9.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget);
+											var9.packetBuffer.method6951(Client.selectedSpellChildIndex);
+											var9.packetBuffer.method6860(var1);
+											var9.packetBuffer.writeShort(var0);
+											var9.packetBuffer.method6951(Client.field645);
+											Client.packetWriter.addNode(var9);
+										}
+									} else if (var2 == 1001) {
+										Client.mouseCrossX = var6;
+										Client.mouseCrossY = var7;
+										Client.mouseCrossColor = 2;
+										Client.mouseCrossState = 0;
+										Client.destinationX = var0;
+										Client.destinationY = var1;
+										var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher);
+										var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX);
+										var8.packetBuffer.method6851(class320.baseY + var1);
+										var8.packetBuffer.writeShort(var3);
+										var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+										Client.packetWriter.addNode(var8);
+									} else if (var2 == 1002) {
+										Client.mouseCrossX = var6;
+										Client.mouseCrossY = var7;
+										Client.mouseCrossColor = 2;
+										Client.mouseCrossState = 0;
+										var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2746, Client.packetWriter.isaacCipher);
+										var8.packetBuffer.method6851(var3);
+										Client.packetWriter.addNode(var8);
+									} else if (var2 == 1003) {
+										Client.mouseCrossX = var6;
+										Client.mouseCrossY = var7;
+										Client.mouseCrossColor = 2;
+										Client.mouseCrossState = 0;
+										var13 = Client.npcs[var3];
+										if (var13 != null) {
+											NPCComposition var17 = var13.definition;
+											if (var17.transforms != null) {
+												var17 = var17.transform();
+											}
+
+											if (var17 != null) {
+												var10 = FriendSystem.getPacketBufferNode(ClientPacket.field2721, Client.packetWriter.isaacCipher);
+												var10.packetBuffer.method6852(var17.id);
+												Client.packetWriter.addNode(var10);
+											}
+										}
+									} else if (var2 == 1004) {
+										Client.mouseCrossX = var6;
+										Client.mouseCrossY = var7;
+										Client.mouseCrossColor = 2;
+										Client.mouseCrossState = 0;
+										var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher);
+										var8.packetBuffer.method6851(var3);
+										Client.packetWriter.addNode(var8);
+									} else if (var2 == 1005) {
+										var16 = class87.getWidget(var1);
+										if (var16 != null && var16.itemQuantities[var0] >= 100000) {
+											SecureRandomCallable.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class65.ItemDefinition_get(var3).name);
+										} else {
+											var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher);
+											var9.packetBuffer.method6851(var3);
+											Client.packetWriter.addNode(var9);
+										}
+
+										Client.field727 = 0;
+										FriendsChat.field3934 = class87.getWidget(var1);
+										Client.field593 = var0;
+									} else if (var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1009 || var2 == 1012) {
+										class65.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1));
+									}
+								} else {
+									var16 = ParamComposition.getWidgetChild(var1, var0);
+									if (var16 != null) {
+										MouseHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5);
+									}
+								}
+							}
+						}
+					}
+				}
 			}
 		}
+
+		if (Client.isItemSelected != 0) {
+			Client.isItemSelected = 0;
+			Actor.invalidateWidget(class87.getWidget(Tiles.selectedItemWidget));
+		}
+
+		if (Client.isSpellSelected) {
+			ReflectionCheck.Widget_runOnTargetLeave();
+		}
+
+		if (FriendsChat.field3934 != null && Client.field727 == 0) {
+			Actor.invalidateWidget(FriendsChat.field3934);
+		}
+
 	}
 }

runescape-client/src/main/java/Ignored.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("lt")
+@ObfuscatedName("ml")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1976990997
+		intValue = -831715971
 	)
 	@Export("id")
 	int id;
@@ -17,20 +18,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Llt;I)I",
-		garbageValue = "-338055787"
+		descriptor = "(Lml;I)I",
+		garbageValue = "-1906046091"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Llm;I)I",
-		garbageValue = "2074675333"
+		descriptor = "(Lle;I)I",
+		garbageValue = "-1041307648"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -40,4 +41,176 @@ public class Ignored extends User {
 	public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1);
 	}
+
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		descriptor = "(ILbg;ZB)I",
+		garbageValue = "117"
+	)
+	static int method6061(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.OC_NAME) {
+			var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class65.ItemDefinition_get(var3).name;
+			return 1;
+		} else {
+			int var4;
+			ItemComposition var5;
+			if (var0 == ScriptOpcodes.OC_OP) {
+				class240.Interpreter_intStackSize -= 2;
+				var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize];
+				var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1];
+				var5 = class65.ItemDefinition_get(var3);
+				if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
+				} else {
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.OC_IOP) {
+				class240.Interpreter_intStackSize -= 2;
+				var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize];
+				var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1];
+				var5 = class65.ItemDefinition_get(var3);
+				if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
+				} else {
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.OC_COST) {
+				var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).price;
+				return 1;
+			} else if (var0 == ScriptOpcodes.OC_STACKABLE) {
+				var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+				Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0;
+				return 1;
+			} else {
+				ItemComposition var7;
+				if (var0 == ScriptOpcodes.OC_CERT) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					var7 = class65.ItemDefinition_get(var3);
+					if (var7.noteTemplate == -1 && var7.note >= 0) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.OC_UNCERT) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					var7 = class65.ItemDefinition_get(var3);
+					if (var7.noteTemplate >= 0 && var7.note >= 0) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.OC_MEMBERS) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).isMembersOnly ? 1 : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					var7 = class65.ItemDefinition_get(var3);
+					if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
+					var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					var7 = class65.ItemDefinition_get(var3);
+					if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.OC_FIND) {
+					String var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+					UserComparator3.findItemDefinitions(var6, var4 == 1);
+					Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = HealthBarUpdate.foundItemIdCount;
+					return 1;
+				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) {
+					if (var0 == ScriptOpcodes.OC_FINDRESET) {
+						KeyHandler.foundItemIndex = 0;
+						return 1;
+					} else if (var0 == 4213) {
+						var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize];
+						var4 = class65.ItemDefinition_get(var3).getShiftClickIndex();
+						if (var4 == -1) {
+							Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4;
+						} else {
+							Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4 + 1;
+						}
+
+						return 1;
+					} else {
+						return 2;
+					}
+				} else {
+					if (class7.foundItemIds != null && KeyHandler.foundItemIndex < HealthBarUpdate.foundItemIdCount) {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class7.foundItemIds[++KeyHandler.foundItemIndex - 1] & '\uffff';
+					} else {
+						Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1;
+					}
+
+					return 1;
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("an")
+	@ObfuscatedSignature(
+		descriptor = "([BIII)I",
+		garbageValue = "148563653"
+	)
+	public static int method6065(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;
+	}
+
+	@ObfuscatedName("ge")
+	@ObfuscatedSignature(
+		descriptor = "(Lco;B)Z",
+		garbageValue = "8"
+	)
+	static boolean method6063(Player var0) {
+		if (Client.drawPlayerNames == 0) {
+			return false;
+		} else if (class129.localPlayer == var0) {
+			return class1.method9();
+		} else {
+			boolean var1 = ObjectSound.method1734();
+			boolean var2;
+			if (!var1) {
+				var2 = (Client.drawPlayerNames & 1) != 0;
+				var1 = var2 && var0.isFriend();
+			}
+
+			var2 = var1;
+			if (!var1) {
+				boolean var3 = (Client.drawPlayerNames & 2) != 0;
+				var2 = var3 && var0.isFriendsChatMember();
+			}
+
+			return var2;
+		}
+	}
 }

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

@@ -2,38 +2,35 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("of")
+@ObfuscatedName("oi")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@Export("height")
 	public int height;
 
-	IndexedSprite() {
-	}
-
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) {
@@ -54,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) {
@@ -87,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -133,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("l")
-	public void method7066(int var1, int var2, int var3, int var4) {
+	@ObfuscatedName("o")
+	public void method7206(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth;
 		int var6 = this.subHeight;
 		int var7 = 0;
@@ -195,7 +192,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("j")
+	@ObfuscatedName("k")
 	@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 +246,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("n")
+	@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("ak")
+@ObfuscatedName("bd")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("c")
+	@ObfuscatedName("j")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("z")
+	@ObfuscatedName("r")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("y")
+	@ObfuscatedName("w")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("w")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("o")
+	@ObfuscatedName("u")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Laz;"
+		descriptor = "Lax;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lg;"
+		descriptor = "Lau;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@Export("offset")
 	int offset;
 
@@ -146,10 +146,10 @@ public class Instrument {
 		this.offset = 0;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
-		class308.clearIntArray(Instrument_samples, 0, var1);
+		class321.clearIntArray(Instrument_samples, 0, var1);
 		if (var2 < 10) {
 			return Instrument_samples;
 		} else {
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;)V"
+		descriptor = "(Lot;)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.method812(var1, this.filterEnvelope);
+		this.filter.method1057(var1, this.filterEnvelope);
 	}
 }