rev185

buildSrc/src/main/kotlin/Dependencies.kt

@@ -27,11 +27,11 @@ const val kotlinVersion = "1.3.50"
 
 object ProjectVersions {
     const val launcherVersion = "2.0.3"
-    const val rlVersion = "1.5.37-SNAPSHOT"
+    const val rlVersion = "1.5.38-SNAPSHOT"
 
     const val openosrsVersion = "2.1.8.0"
 
-    const val rsversion = 184
+    const val rsversion = 185
     const val cacheversion = 165
 }
 

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -63,7 +63,7 @@ public interface RSClient extends RSGameShell, Client
 	@Override
 	int getCameraZ2();
 
-	@Import("plane")
+	@Import("Scene_plane")
 	@Override
 	int getPlane();
 

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

@@ -4,87 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hp")
+@ObfuscatedName("hq")
 @Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("so")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lbl;"
+		signature = "Llj;"
-	)
-	@Export("clientPreferences")
-	static ClientPreferences clientPreferences;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "Llr;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 949229889
+		intValue = -1159865063
 	)
-	static int field3122;
+	static int field3128;
-	@ObfuscatedName("n")
+	@ObfuscatedName("hs")
 	@ObfuscatedGetter(
-		intValue = -2001153217
+		intValue = 906312301
+	)
+	@Export("oculusOrbFocalPointY")
+	static int oculusOrbFocalPointY;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -869416099
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Llk;"
+		signature = "Lle;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "[Llk;"
+		signature = "[Lle;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@Export("files")
 	Object[][] files;
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 194523033
+		intValue = -514507625
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("t")
+	@ObfuscatedName("r")
 	@Export("shallowFiles")
 	boolean shallowFiles;
 
 	static {
 		gzipDecompressor = new GZipDecompressor();
-		field3122 = 0;
+		field3128 = 0;
 	}
 
 	AbstractArchive(boolean var1, boolean var2) {
@@ -92,131 +92,133 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "([BS)V",
+		signature = "([BI)V",
-		garbageValue = "4095"
+		garbageValue = "-702728253"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
-		this.hash = Username.method5147(var1, var1.length);
+		int var3 = var1.length;
-		Buffer var2 = new Buffer(MusicPatch.decompressBytes(var1));
+		int var2 = class3.method50(var1, 0, var3);
-		int var3 = var2.readUnsignedByte();
+		this.hash = var2;
-		if (var3 >= 5 && var3 <= 7) {
+		Buffer var4 = new Buffer(ArchiveLoader.decompressBytes(var1));
-			if (var3 >= 6) {
+		int var5 = var4.readUnsignedByte();
-				var2.readInt();
+		if (var5 >= 5 && var5 <= 7) {
+			if (var5 >= 6) {
+				var4.readInt();
 			}
 
-			int var4 = var2.readUnsignedByte();
+			int var6 = var4.readUnsignedByte();
-			if (var3 >= 7) {
+			if (var5 >= 7) {
-				this.groupCount = var2.method5458();
+				this.groupCount = var4.method5624();
 			} else {
-				this.groupCount = var2.readUnsignedShort();
+				this.groupCount = var4.readUnsignedShort();
 			}
 
-			int var5 = 0;
+			int var7 = 0;
-			int var6 = -1;
+			int var8 = -1;
 			this.groupIds = new int[this.groupCount];
-			int var7;
+			int var9;
-			if (var3 >= 7) {
+			if (var5 >= 7) {
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					this.groupIds[var7] = var5 += var2.method5458();
+					this.groupIds[var9] = var7 += var4.method5624();
-					if (this.groupIds[var7] > var6) {
+					if (this.groupIds[var9] > var8) {
-						var6 = this.groupIds[var7];
+						var8 = this.groupIds[var9];
 					}
 				}
 			} else {
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					this.groupIds[var7] = var5 += var2.readUnsignedShort();
+					this.groupIds[var9] = var7 += var4.readUnsignedShort();
-					if (this.groupIds[var7] > var6) {
+					if (this.groupIds[var9] > var8) {
-						var6 = this.groupIds[var7];
+						var8 = this.groupIds[var9];
 					}
 				}
 			}
 
-			this.groupCrcs = new int[var6 + 1];
+			this.groupCrcs = new int[var8 + 1];
-			this.groupVersions = new int[var6 + 1];
+			this.groupVersions = new int[var8 + 1];
-			this.fileCounts = new int[var6 + 1];
+			this.fileCounts = new int[var8 + 1];
-			this.fileIds = new int[var6 + 1][];
+			this.fileIds = new int[var8 + 1][];
-			this.groups = new Object[var6 + 1];
+			this.groups = new Object[var8 + 1];
-			this.files = new Object[var6 + 1][];
+			this.files = new Object[var8 + 1][];
-			if (var4 != 0) {
+			if (var6 != 0) {
-				this.groupNameHashes = new int[var6 + 1];
+				this.groupNameHashes = new int[var8 + 1];
 
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
+					this.groupNameHashes[this.groupIds[var9]] = var4.readInt();
 				}
 
 				this.groupNameHashTable = new IntHashTable(this.groupNameHashes);
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) {
+			for (var9 = 0; var9 < this.groupCount; ++var9) {
-				this.groupCrcs[this.groupIds[var7]] = var2.readInt();
+				this.groupCrcs[this.groupIds[var9]] = var4.readInt();
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) {
+			for (var9 = 0; var9 < this.groupCount; ++var9) {
-				this.groupVersions[this.groupIds[var7]] = var2.readInt();
+				this.groupVersions[this.groupIds[var9]] = var4.readInt();
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) {
+			for (var9 = 0; var9 < this.groupCount; ++var9) {
-				this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
+				this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort();
 			}
 
-			int var8;
-			int var9;
 			int var10;
 			int var11;
 			int var12;
-			if (var3 >= 7) {
+			int var13;
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
+			int var14;
-					var8 = this.groupIds[var7];
+			if (var5 >= 7) {
-					var9 = this.fileCounts[var8];
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					var5 = 0;
+					var10 = this.groupIds[var9];
-					var10 = -1;
+					var11 = this.fileCounts[var10];
-					this.fileIds[var8] = new int[var9];
+					var7 = 0;
+					var12 = -1;
+					this.fileIds[var10] = new int[var11];
 
-					for (var11 = 0; var11 < var9; ++var11) {
+					for (var13 = 0; var13 < var11; ++var13) {
-						var12 = this.fileIds[var8][var11] = var5 += var2.method5458();
+						var14 = this.fileIds[var10][var13] = var7 += var4.method5624();
-						if (var12 > var10) {
+						if (var14 > var12) {
-							var10 = 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) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					var8 = this.groupIds[var7];
+					var10 = this.groupIds[var9];
-					var9 = this.fileCounts[var8];
+					var11 = this.fileCounts[var10];
-					var5 = 0;
+					var7 = 0;
-					var10 = -1;
+					var12 = -1;
-					this.fileIds[var8] = new int[var9];
+					this.fileIds[var10] = new int[var11];
 
-					for (var11 = 0; var11 < var9; ++var11) {
+					for (var13 = 0; var13 < var11; ++var13) {
-						var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort();
+						var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort();
-						if (var12 > var10) {
+						if (var14 > var12) {
-							var10 = var12;
+							var12 = var14;
 						}
 					}
 
-					this.files[var8] = new Object[var10 + 1];
+					this.files[var10] = new Object[var12 + 1];
 				}
 			}
 
-			if (var4 != 0) {
+			if (var6 != 0) {
-				this.fileNameHashes = new int[var6 + 1][];
+				this.fileNameHashes = new int[var8 + 1][];
-				this.fileNameHashTables = new IntHashTable[var6 + 1];
+				this.fileNameHashTables = new IntHashTable[var8 + 1];
 
-				for (var7 = 0; var7 < this.groupCount; ++var7) {
+				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					var8 = this.groupIds[var7];
+					var10 = this.groupIds[var9];
-					var9 = this.fileCounts[var8];
+					var11 = this.fileCounts[var10];
-					this.fileNameHashes[var8] = new int[this.files[var8].length];
+					this.fileNameHashes[var10] = new int[this.files[var10].length];
 
-					for (var10 = 0; var10 < var9; ++var10) {
+					for (var12 = 0; var12 < var11; ++var12) {
-						this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
+						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]);
 				}
 			}
 
@@ -225,29 +227,29 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IB)V",
-		garbageValue = "15"
+		garbageValue = "117"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IIS)[B",
+		signature = "(III)[B",
-		garbageValue = "3526"
+		garbageValue = "-1573138603"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
 		return this.takeFileEncrypted(var1, var2, (int[])null);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(II[II)[B",
+		signature = "(II[IB)[B",
-		garbageValue = "726476664"
+		garbageValue = "0"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
@@ -263,7 +265,7 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var5 = GrandExchangeOfferUnitPriceComparator.serialize(this.files[var1][var2], false);
+			byte[] var5 = Decimator.serialize(this.files[var1][var2], false);
 			if (this.shallowFiles) {
 				this.files[var1][var2] = null;
 			}
@@ -274,10 +276,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "1834518299"
+		garbageValue = "2054202524"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
@@ -295,12 +297,12 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(IS)Z",
-		garbageValue = "-812316387"
+		garbageValue = "-31796"
 	)
-	public boolean method4127(int var1) {
+	public boolean method4327(int var1) {
 		if (this.files.length == 1) {
 			return this.tryLoadFile(0, var1);
 		} else if (this.files[var1].length == 1) {
@@ -310,10 +312,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-1731378181"
+		garbageValue = "-1781242235"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
@@ -325,10 +327,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "304263263"
+		garbageValue = "-2109708107"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
@@ -347,20 +349,20 @@ public abstract class AbstractArchive {
 		return var1;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-2030453035"
+		garbageValue = "-778670663"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		return this.groups[var1] != null ? 100 : 0;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(II)[B",
+		signature = "(IB)[B",
-		garbageValue = "1500956982"
+		garbageValue = "-112"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
@@ -373,10 +375,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(III)[B",
-		garbageValue = "1923776823"
+		garbageValue = "-315309482"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
@@ -392,17 +394,17 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var4 = GrandExchangeOfferUnitPriceComparator.serialize(this.files[var1][var2], false);
+			byte[] var4 = Decimator.serialize(this.files[var1][var2], false);
 			return var4;
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IB)[B",
+		signature = "(II)[B",
-		garbageValue = "96"
+		garbageValue = "-2080975442"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
@@ -415,49 +417,49 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "848617854"
+		garbageValue = "664192835"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(IB)[I",
+		signature = "(II)[I",
-		garbageValue = "-61"
+		garbageValue = "1547416359"
 	)
 	@Export("getGroupFileIds")
 	public int[] getGroupFileIds(int var1) {
 		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-1937840631"
+		garbageValue = "-829743673"
 	)
 	@Export("getGroupFileCount")
 	public int getGroupFileCount(int var1) {
 		return this.files[var1].length;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-101"
+		garbageValue = "107"
 	)
 	@Export("getGroupCount")
 	public int getGroupCount() {
 		return this.files.length;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1193777199"
+		garbageValue = "77380292"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
@@ -467,10 +469,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "1926198322"
+		garbageValue = "17"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
@@ -480,10 +482,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1263344370"
+		garbageValue = "1828023605"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
@@ -497,10 +499,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(I[II)Z",
-		garbageValue = "1408640769"
+		garbageValue = "1853690533"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
@@ -523,15 +525,15 @@ public abstract class AbstractArchive {
 				return true;
 			} else {
 				byte[] var18;
-				if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) {
+				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
-					var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], true);
+					var18 = Decimator.serialize(this.groups[var1], false);
+				} else {
+					var18 = Decimator.serialize(this.groups[var1], true);
 					Buffer var8 = new Buffer(var18);
 					var8.xteaDecrypt(var2, 5, var8.array.length);
-				} else {
-					var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], false);
 				}
 
-				byte[] var20 = MusicPatch.decompressBytes(var18);
+				byte[] var20 = ArchiveLoader.decompressBytes(var18);
 				if (this.releaseGroups) {
 					this.groups[var1] = null;
 				}
@@ -579,13 +581,13 @@ public abstract class AbstractArchive {
 
 					for (var15 = 0; var15 < var3; ++var15) {
 						if (!this.shallowFiles) {
-							var5[var4[var15]] = GrandExchangeEvents.method76(var19[var15], false);
+							var5[var4[var15]] = MusicPatchPcmStream.method4064(var19[var15], false);
 						} else {
 							var5[var4[var15]] = var19[var15];
 						}
 					}
 				} else if (!this.shallowFiles) {
-					var5[var4[0]] = GrandExchangeEvents.method76(var20, false);
+					var5[var4[0]] = MusicPatchPcmStream.method4064(var20, false);
 				} else {
 					var5[var4[0]] = var20;
 				}
@@ -595,95 +597,95 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "-276996300"
+		garbageValue = "-568803871"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
 		var1 = var1.toLowerCase();
-		return this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		return this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;I)I",
+		signature = "(ILjava/lang/String;B)I",
-		garbageValue = "-1445606076"
+		garbageValue = "1"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
 		var2 = var2.toLowerCase();
-		return this.fileNameHashTables[var1].get(WorldMapData_0.hashString(var2));
+		return this.fileNameHashTables[var1].get(WorldMapIcon_0.hashString(var2));
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;S)Z",
+		signature = "(Ljava/lang/String;Ljava/lang/String;B)Z",
-		garbageValue = "8717"
+		garbageValue = "-1"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		int var3 = this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
 		if (var3 < 0) {
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(WorldMapData_0.hashString(var2));
+			int var4 = this.fileNameHashTables[var3].get(WorldMapIcon_0.hashString(var2));
 			return var4 >= 0;
 		}
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;B)[B",
+		signature = "(Ljava/lang/String;Ljava/lang/String;I)[B",
-		garbageValue = "0"
+		garbageValue = "1996624784"
 	)
 	@Export("takeFileByNames")
 	public byte[] takeFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		int var3 = this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(WorldMapData_0.hashString(var2));
+		int var4 = this.fileNameHashTables[var3].get(WorldMapIcon_0.hashString(var2));
 		return this.takeFile(var3, var4);
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;B)Z",
+		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "-68"
+		garbageValue = "1453372171"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		int var3 = this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(WorldMapData_0.hashString(var2));
+		int var4 = this.fileNameHashTables[var3].get(WorldMapIcon_0.hashString(var2));
 		return this.tryLoadFile(var3, var4);
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)Z",
-		garbageValue = "1601927711"
+		garbageValue = "1150520386"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		int var2 = this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
 		return this.tryLoadGroup(var2);
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-63"
+		garbageValue = "-94"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		int var2 = this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
 		if (var2 >= 0) {
 			this.loadRegionFromGroup(var2);
 		}
@@ -691,23 +693,119 @@ public abstract class AbstractArchive {
 
 	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)I",
+		signature = "(Ljava/lang/String;B)I",
-		garbageValue = "-2026426136"
+		garbageValue = "125"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
+		int var2 = this.groupNameHashTable.get(WorldMapIcon_0.hashString(var1));
 		return this.groupLoadPercent(var2);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(CI)Z",
+		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-715141816"
+		garbageValue = "-1378160996"
 	)
-	@Export("isAlphaNumeric")
+	@Export("colorStartTag")
-	public static boolean isAlphaNumeric(char var0) {
+	static String colorStartTag(int var0) {
-		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+		return "<col=" + Integer.toHexString(var0) + ">";
+	}
+
+	@ObfuscatedName("fm")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "-1166291616"
+	)
+	@Export("getLoginError")
+	static void getLoginError(int var0) {
+		if (var0 == -3) {
+			GrandExchangeOffer.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
+		} else if (var0 == -2) {
+			GrandExchangeOffer.setLoginResponseString("", "Error connecting to server.", "");
+		} else if (var0 == -1) {
+			GrandExchangeOffer.setLoginResponseString("No response from server.", "Please try using a different world.", "");
+		} else if (var0 == 3) {
+			Login.loginIndex = 3;
+			Login.field1166 = 1;
+		} else if (var0 == 4) {
+			Login.loginIndex = 12;
+			Login.field1156 = 0;
+		} else if (var0 == 5) {
+			Login.field1166 = 2;
+			GrandExchangeOffer.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes.");
+		} else if (var0 == 68 || !Client.onMobile && var0 == 6) {
+			GrandExchangeOffer.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", "");
+		} else if (var0 == 7) {
+			GrandExchangeOffer.setLoginResponseString("This world is full.", "Please use a different world.", "");
+		} else if (var0 == 8) {
+			GrandExchangeOffer.setLoginResponseString("Unable to connect.", "Login server offline.", "");
+		} else if (var0 == 9) {
+			GrandExchangeOffer.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
+		} else if (var0 == 10) {
+			GrandExchangeOffer.setLoginResponseString("Unable to connect.", "Bad session id.", "");
+		} else if (var0 == 11) {
+			GrandExchangeOffer.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+		} else if (var0 == 12) {
+			GrandExchangeOffer.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
+		} else if (var0 == 13) {
+			GrandExchangeOffer.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
+		} else if (var0 == 14) {
+			GrandExchangeOffer.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 16) {
+			GrandExchangeOffer.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
+		} else if (var0 == 17) {
+			GrandExchangeOffer.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
+		} else if (var0 == 18) {
+			Login.loginIndex = 12;
+			Login.field1156 = 1;
+		} else if (var0 == 19) {
+			GrandExchangeOffer.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
+		} else if (var0 == 20) {
+			GrandExchangeOffer.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
+		} else if (var0 == 22) {
+			GrandExchangeOffer.setLoginResponseString("Malformed login packet.", "Please try again.", "");
+		} else if (var0 == 23) {
+			GrandExchangeOffer.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 24) {
+			GrandExchangeOffer.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
+		} else if (var0 == 25) {
+			GrandExchangeOffer.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
+		} else if (var0 == 26) {
+			GrandExchangeOffer.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
+		} else if (var0 == 27) {
+			GrandExchangeOffer.setLoginResponseString("", "Service unavailable.", "");
+		} else if (var0 == 31) {
+			GrandExchangeOffer.setLoginResponseString("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game.");
+		} else if (var0 == 32) {
+			GrandExchangeOffer.setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system.");
+		} else if (var0 == 37) {
+			GrandExchangeOffer.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
+		} else if (var0 == 38) {
+			GrandExchangeOffer.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
+		} else if (var0 == 55) {
+			Login.loginIndex = 8;
+		} else {
+			if (var0 == 56) {
+				GrandExchangeOffer.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", "");
+				Tile.updateGameState(11);
+				return;
+			}
+
+			if (var0 == 57) {
+				GrandExchangeOffer.setLoginResponseString("The code you entered was incorrect.", "Please try again.", "");
+				Tile.updateGameState(11);
+				return;
+			}
+
+			if (var0 == 61) {
+				Login.loginIndex = 7;
+			} else {
+				GrandExchangeOffer.setLoginResponseString("Unexpected server response", "Please try using a different world.", "");
+			}
+		}
+
+		Tile.updateGameState(10);
 	}
 }

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

@@ -1,111 +1,72 @@
 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("gx")
+@ObfuscatedName("gc")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 977117713
+	)
+	@Export("WorldMapElement_count")
+	public static int WorldMapElement_count;
+
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(B)[B",
-		garbageValue = "-37"
+		garbageValue = "19"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BB)V",
-		garbageValue = "-793496359"
+		garbageValue = "-93"
 	)
 	@Export("set")
 	abstract void set(byte[] var1);
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Lbo;",
+		signature = "(ILcj;ZI)I",
-		garbageValue = "1470103686"
+		garbageValue = "2005076338"
 	)
-	@Export("getNextWorldListWorld")
+	static int method4093(int var0, Script var1, boolean var2) {
-	static World getNextWorldListWorld() {
+		Widget var3 = var2 ? class96.field1301 : ReflectionCheck.field1310;
-		return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null;
+		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) {
+			if (var3.itemId != -1) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity;
+			} else {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETID) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex;
+			return 1;
+		} else {
+			return 2;
+		}
 	}
 
-	@ObfuscatedName("gv")
+	@ObfuscatedName("kb")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
+		signature = "(B)V",
-		garbageValue = "949599509"
+		garbageValue = "-66"
 	)
-	@Export("setViewportShape")
+	static final void method4092() {
-	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		Client.field825 = Client.cycleCntr;
-		if (var2 < 1) {
+		Ignored.ClanChat_inClanChat = true;
-			var2 = 1;
-		}
-
-		if (var3 < 1) {
-			var3 = 1;
-		}
-
-		int var5 = var3 - 334;
-		int var6;
-		if (var5 < 0) {
-			var6 = Client.field880;
-		} else if (var5 >= 100) {
-			var6 = Client.field887;
-		} else {
-			var6 = (Client.field887 - Client.field880) * var5 / 100 + Client.field880;
-		}
-
-		int var7 = var3 * var6 * 512 / (var2 * 334);
-		int var8;
-		int var9;
-		short var10;
-		if (var7 < Client.field892) {
-			var10 = Client.field892;
-			var6 = var10 * var2 * 334 / (var3 * 512);
-			if (var6 > Client.field891) {
-				var6 = Client.field891;
-				var8 = var3 * var6 * 512 / (var10 * 334);
-				var9 = (var2 - var8) / 2;
-				if (var4) {
-					Rasterizer2D.Rasterizer2D_resetClip();
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
-				}
-
-				var0 += var9;
-				var2 -= var9 * 2;
-			}
-		} else if (var7 > Client.field893) {
-			var10 = Client.field893;
-			var6 = var10 * var2 * 334 / (var3 * 512);
-			if (var6 < Client.field686) {
-				var6 = Client.field686;
-				var8 = var10 * var2 * 334 / (var6 * 512);
-				var9 = (var3 - var8) / 2;
-				if (var4) {
-					Rasterizer2D.Rasterizer2D_resetClip();
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
-				}
-
-				var1 += var9;
-				var3 -= var9 * 2;
-			}
-		}
-
-		Client.viewportZoom = var3 * var6 / 334;
-		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
-			GrandExchangeOfferTotalQuantityComparator.method91(var2, var3);
-		}
-
-		Client.viewportOffsetX = var0;
-		Client.viewportOffsetY = var1;
-		Client.viewportWidth = var2;
-		Client.viewportHeight = var3;
 	}
 }

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

@@ -4,76 +4,76 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kh")
+@ObfuscatedName("kx")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "[Llp;"
+		signature = "[Llw;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("t")
+	@ObfuscatedName("r")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
 	@ObfuscatedName("f")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.readMetrics(var1);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@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)method5290(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5506(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("d")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}
 
-		return this.advances[Entity.charToByteCp1252(var1) & 255];
+		return this.advances[WorldMapData_1.charToByteCp1252(var1) & 255];
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("m")
 	@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 = TilePaint.parseInt(var7.substring(4));
+										int var8 = ClientPreferences.parseInt(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)(Entity.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(WorldMapData_1.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("o")
+	@ObfuscatedName("p")
 	@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 = TilePaint.parseInt(var16.substring(4));
+								int var17 = ClientPreferences.parseInt(var16.substring(4));
 								var4 += AbstractFont_modIconSprites[var17].width;
 								var11 = 0;
 							} catch (Exception var20) {
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("h")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("j")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("r")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("s")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@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 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ad")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) {
@@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ag")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,28 +582,38 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("av")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
+			int var2;
+			String var3;
 			if (var1.startsWith("col=")) {
-				AbstractFont_color = class2.method29(var1.substring(4), 16);
+				var3 = var1.substring(4);
+				var2 = class192.parseIntCustomRadix(var3, 16, true);
+				AbstractFont_color = var2;
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) {
-				AbstractFont_strike = class2.method29(var1.substring(4), 16);
+				var3 = var1.substring(4);
+				var2 = class192.parseIntCustomRadix(var3, 16, true);
+				AbstractFont_strike = var2;
 			} else if (var1.equals("str")) {
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) {
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) {
-				AbstractFont_underline = class2.method29(var1.substring(2), 16);
+				var3 = var1.substring(2);
+				var2 = class192.parseIntCustomRadix(var3, 16, true);
+				AbstractFont_underline = var2;
 			} else if (var1.equals("u")) {
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) {
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) {
-				AbstractFont_shadow = class2.method29(var1.substring(5), 16);
+				var3 = var1.substring(5);
+				var2 = class192.parseIntCustomRadix(var3, 16, true);
+				AbstractFont_shadow = var2;
 			} else if (var1.equals("shad")) {
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) {
@@ -611,12 +621,12 @@ public abstract class AbstractFont extends Rasterizer2D {
 			} else if (var1.equals("br")) {
 				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
 			}
-		} catch (Exception var3) {
+		} catch (Exception var5) {
 		}
 
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("am")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -639,7 +649,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -648,7 +658,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var6 = 0; var6 < var1.length(); ++var6) {
 			if (var1.charAt(var6) != 0) {
-				char var7 = (char)(Entity.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(WorldMapData_1.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -662,7 +672,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) {
 								if (var8.startsWith("img=")) {
 									try {
-										var9 = TilePaint.parseInt(var8.substring(4));
+										var9 = ClientPreferences.parseInt(var8.substring(4));
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9];
 										var10.drawAt(var2, var3 + this.ascent - var10.height);
 										var2 += var10.width;
@@ -728,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("ax")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -738,7 +748,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var9 = 0; var9 < var1.length(); ++var9) {
 			if (var1.charAt(var9) != 0) {
-				char var10 = (char)(Entity.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(WorldMapData_1.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -767,7 +777,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}
 
 										++var8;
-										var14 = TilePaint.parseInt(var11.substring(4));
+										var14 = ClientPreferences.parseInt(var11.substring(4));
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14];
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
 										var2 += var15.width;
@@ -847,7 +857,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 	}
 
 	@ObfuscatedName("i")
-	static int method5290(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	static int method5506(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];
@@ -911,7 +921,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("al")
 	@Export("AbstractFont_drawGlyph")
 	static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -953,7 +963,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ap")
 	@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);
@@ -1001,7 +1011,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("aj")
 	@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;
@@ -1043,7 +1053,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("an")
+	@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,27 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lm")
+@ObfuscatedName("lu")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("p")
+	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "Llp;"
-	)
-	@Export("titlebuttonSprite")
-	static IndexedSprite titlebuttonSprite;
-	@ObfuscatedName("v")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1221954905
+		intValue = -1627177537
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 809652275
+		intValue = -594636233
 	)
 	@Export("height")
 	public int height;
@@ -32,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "-1952064900"
+		garbageValue = "3"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "-67564732"
+		garbageValue = "-2086134046"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-997992638"
+		garbageValue = "-2129049965"
 	)
 	@Export("apply")
 	public final void apply() {

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

@@ -4,57 +4,684 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ky")
+@ObfuscatedName("ku")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-119"
+		garbageValue = "1632517280"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "1784126558"
+		garbageValue = "0"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "3"
+		garbageValue = "-1"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-336706705"
+		garbageValue = "1174929907"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-2035668362"
+		garbageValue = "1681485484"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "-68"
+		garbageValue = "1989353375"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
+
+	@ObfuscatedName("hj")
+	@ObfuscatedSignature(
+		signature = "(Lbz;IIIIII)V",
+		garbageValue = "-453340900"
+	)
+	@Export("drawActor2d")
+	static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
+		if (var0 != null && var0.isVisible()) {
+			if (var0 instanceof NPC) {
+				NPCDefinition var6 = ((NPC)var0).definition;
+				if (var6.transforms != null) {
+					var6 = var6.transform();
+				}
+
+				if (var6 == null) {
+					return;
+				}
+			}
+
+			int var75 = Players.Players_count;
+			int[] var7 = Players.Players_indices;
+			byte var8 = 0;
+			Player var10;
+			if (var1 < var75 && var0.playerCycle == Client.cycle) {
+				var10 = (Player)var0;
+				boolean var9;
+				if (Client.drawPlayerNames == 0) {
+					var9 = false;
+				} else {
+					boolean var77;
+					if (var10 != class215.localPlayer) {
+						var77 = (Client.drawPlayerNames & 4) != 0;
+						boolean var78 = var77;
+						boolean var13;
+						if (!var77) {
+							var13 = (Client.drawPlayerNames & 1) != 0;
+							var78 = var13 && var10.isFriend();
+						}
+
+						var13 = var78;
+						if (!var78) {
+							boolean var79 = (Client.drawPlayerNames & 2) != 0;
+							var13 = var79 && var10.isClanMember();
+						}
+
+						var9 = var13;
+					} else {
+						var77 = (Client.drawPlayerNames & 8) != 0;
+						var9 = var77;
+					}
+				}
+
+				if (var9) {
+					Player var11 = (Player)var0;
+					if (var1 < var75) {
+						Entity.getActorScreenLocation(var0, var0.defaultHeight + 15);
+						AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
+						byte var92 = 9;
+						var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0);
+						var8 = 18;
+					}
+				}
+			}
+
+			int var87 = -2;
+			int var15;
+			int var22;
+			int var23;
+			if (!var0.healthBars.method5004()) {
+				Entity.getActorScreenLocation(var0, var0.defaultHeight + 15);
+
+				for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) {
+					HealthBarUpdate var89 = var88.get(Client.cycle);
+					if (var89 == null) {
+						if (var88.isEmpty()) {
+							var88.remove();
+						}
+					} else {
+						HealthBarDefinition var91 = var88.definition;
+						Sprite var76 = var91.getBackSprite();
+						Sprite var14 = var91.getFrontSprite();
+						int var16 = 0;
+						if (var76 != null && var14 != null) {
+							if (var91.widthPadding * 2 < var14.subWidth) {
+								var16 = var91.widthPadding;
+							}
+
+							var15 = var14.subWidth - var16 * 2;
+						} else {
+							var15 = var91.width;
+						}
+
+						int var17 = 255;
+						boolean var18 = true;
+						int var19 = Client.cycle - var89.cycle;
+						int var20 = var15 * var89.health2 / var91.width;
+						int var21;
+						int var93;
+						if (var89.cycleOffset > var19) {
+							var21 = var91.int4 == 0 ? 0 : var91.int4 * (var19 / var91.int4);
+							var22 = var15 * var89.health / var91.width;
+							var93 = var21 * (var20 - var22) / var89.cycleOffset + var22;
+						} else {
+							var93 = var20;
+							var21 = var89.cycleOffset + var91.int5 - var19;
+							if (var91.int3 >= 0) {
+								var17 = (var21 << 8) / (var91.int5 - var91.int3);
+							}
+						}
+
+						if (var89.health2 > 0 && var93 < 1) {
+							var93 = 1;
+						}
+
+						if (var76 != null && var14 != null) {
+							if (var93 == var15) {
+								var93 += var16 * 2;
+							} else {
+								var93 += var16;
+							}
+
+							var21 = var76.subHeight;
+							var87 += var21;
+							var22 = var2 + Client.viewportTempX - (var15 >> 1);
+							var23 = var3 + Client.viewportTempY - var87;
+							var22 -= var16;
+							if (var17 >= 0 && var17 < 255) {
+								var76.drawTransAt(var22, var23, var17);
+								Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var23 + var21);
+								var14.drawTransAt(var22, var23, var17);
+							} else {
+								var76.drawTransBgAt(var22, var23);
+								Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var21 + var23);
+								var14.drawTransBgAt(var22, var23);
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
+							var87 += 2;
+						} else {
+							var87 += 5;
+							if (Client.viewportTempX > -1) {
+								var21 = var2 + Client.viewportTempX - (var15 >> 1);
+								var22 = var3 + Client.viewportTempY - var87;
+								Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 65280);
+								Rasterizer2D.Rasterizer2D_fillRectangle(var93 + var21, var22, var15 - var93, 5, 16711680);
+							}
+
+							var87 += 2;
+						}
+					}
+				}
+			}
+
+			if (var87 == -2) {
+				var87 += 7;
+			}
+
+			var87 += var8;
+			if (var1 < var75) {
+				var10 = (Player)var0;
+				if (var10.isHidden) {
+					return;
+				}
+
+				if (var10.headIconPk != -1 || var10.headIconPrayer != -1) {
+					Entity.getActorScreenLocation(var0, var0.defaultHeight + 15);
+					if (Client.viewportTempX > -1) {
+						if (var10.headIconPk != -1) {
+							var87 += 25;
+							FriendLoginUpdate.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+						}
+
+						if (var10.headIconPrayer != -1) {
+							var87 += 25;
+							Login.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+						}
+					}
+				}
+
+				if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
+					Entity.getActorScreenLocation(var0, var0.defaultHeight + 15);
+					if (Client.viewportTempX > -1) {
+						var87 += class14.headIconHintSprites[1].subHeight;
+						class14.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+					}
+				}
+			} else {
+				NPCDefinition var90 = ((NPC)var0).definition;
+				if (var90.transforms != null) {
+					var90 = var90.transform();
+				}
+
+				if (var90.headIconPrayer >= 0 && var90.headIconPrayer < Login.headIconPrayerSprites.length) {
+					Entity.getActorScreenLocation(var0, var0.defaultHeight + 15);
+					if (Client.viewportTempX > -1) {
+						Login.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
+					}
+				}
+
+				if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
+					Entity.getActorScreenLocation(var0, var0.defaultHeight + 15);
+					if (Client.viewportTempX > -1) {
+						class14.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
+					}
+				}
+			}
+
+			if (var0.overheadText != null && (var1 >= var75 || !var0.field939 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
+				Entity.getActorScreenLocation(var0, var0.defaultHeight);
+				if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
+					Client.overheadTextXOffsets[Client.overheadTextCount] = class43.fontBold12.stringWidth(var0.overheadText) / 2;
+					Client.overheadTextAscents[Client.overheadTextCount] = class43.fontBold12.ascent;
+					Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX;
+					Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY;
+					Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor;
+					Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect;
+					Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining;
+					Client.overheadText[Client.overheadTextCount] = var0.overheadText;
+					++Client.overheadTextCount;
+				}
+			}
+
+			for (int var80 = 0; var80 < 4; ++var80) {
+				int var96 = var0.hitSplatCycles[var80];
+				int var97 = var0.hitSplatTypes[var80];
+				HitSplatDefinition var95 = null;
+				int var98 = 0;
+				if (var97 >= 0) {
+					if (var96 <= Client.cycle) {
+						continue;
+					}
+
+					var95 = NetFileRequest.method4298(var0.hitSplatTypes[var80]);
+					var98 = var95.field3314;
+					if (var95 != null && var95.transforms != null) {
+						var95 = var95.transform();
+						if (var95 == null) {
+							var0.hitSplatCycles[var80] = -1;
+							continue;
+						}
+					}
+				} else if (var96 < 0) {
+					continue;
+				}
+
+				var15 = var0.hitSplatTypes2[var80];
+				HitSplatDefinition var81 = null;
+				if (var15 >= 0) {
+					var81 = NetFileRequest.method4298(var15);
+					if (var81 != null && var81.transforms != null) {
+						var81 = var81.transform();
+					}
+				}
+
+				if (var96 - var98 <= Client.cycle) {
+					if (var95 == null) {
+						var0.hitSplatCycles[var80] = -1;
+					} else {
+						Entity.getActorScreenLocation(var0, var0.defaultHeight / 2);
+						if (Client.viewportTempX > -1) {
+							if (var80 == 1) {
+								Client.viewportTempY -= 20;
+							}
+
+							if (var80 == 2) {
+								Client.viewportTempX -= 15;
+								Client.viewportTempY -= 10;
+							}
+
+							if (var80 == 3) {
+								Client.viewportTempX += 15;
+								Client.viewportTempY -= 10;
+							}
+
+							Sprite var82 = null;
+							Sprite var83 = null;
+							Sprite var84 = null;
+							Sprite var85 = null;
+							var22 = 0;
+							var23 = 0;
+							int var24 = 0;
+							int var25 = 0;
+							int var26 = 0;
+							int var27 = 0;
+							int var28 = 0;
+							int var29 = 0;
+							Sprite var30 = null;
+							Sprite var31 = null;
+							Sprite var32 = null;
+							Sprite var33 = null;
+							int var34 = 0;
+							int var35 = 0;
+							int var36 = 0;
+							int var37 = 0;
+							int var38 = 0;
+							int var39 = 0;
+							int var40 = 0;
+							int var41 = 0;
+							int var42 = 0;
+							var82 = var95.method4719();
+							int var43;
+							if (var82 != null) {
+								var22 = var82.subWidth;
+								var43 = var82.subHeight;
+								if (var43 > var42) {
+									var42 = var43;
+								}
+
+								var26 = var82.xOffset;
+							}
+
+							var83 = var95.method4709();
+							if (var83 != null) {
+								var23 = var83.subWidth;
+								var43 = var83.subHeight;
+								if (var43 > var42) {
+									var42 = var43;
+								}
+
+								var27 = var83.xOffset;
+							}
+
+							var84 = var95.method4710();
+							if (var84 != null) {
+								var24 = var84.subWidth;
+								var43 = var84.subHeight;
+								if (var43 > var42) {
+									var42 = var43;
+								}
+
+								var28 = var84.xOffset;
+							}
+
+							var85 = var95.method4731();
+							if (var85 != null) {
+								var25 = var85.subWidth;
+								var43 = var85.subHeight;
+								if (var43 > var42) {
+									var42 = var43;
+								}
+
+								var29 = var85.xOffset;
+							}
+
+							if (var81 != null) {
+								var30 = var81.method4719();
+								if (var30 != null) {
+									var34 = var30.subWidth;
+									var43 = var30.subHeight;
+									if (var43 > var42) {
+										var42 = var43;
+									}
+
+									var38 = var30.xOffset;
+								}
+
+								var31 = var81.method4709();
+								if (var31 != null) {
+									var35 = var31.subWidth;
+									var43 = var31.subHeight;
+									if (var43 > var42) {
+										var42 = var43;
+									}
+
+									var39 = var31.xOffset;
+								}
+
+								var32 = var81.method4710();
+								if (var32 != null) {
+									var36 = var32.subWidth;
+									var43 = var32.subHeight;
+									if (var43 > var42) {
+										var42 = var43;
+									}
+
+									var40 = var32.xOffset;
+								}
+
+								var33 = var81.method4731();
+								if (var33 != null) {
+									var37 = var33.subWidth;
+									var43 = var33.subHeight;
+									if (var43 > var42) {
+										var42 = var43;
+									}
+
+									var41 = var33.xOffset;
+								}
+							}
+
+							Font var86 = var95.getFont();
+							if (var86 == null) {
+								var86 = class51.fontPlain11;
+							}
+
+							Font var44;
+							if (var81 != null) {
+								var44 = var81.getFont();
+								if (var44 == null) {
+									var44 = class51.fontPlain11;
+								}
+							} else {
+								var44 = class51.fontPlain11;
+							}
+
+							String var45 = null;
+							String var46 = null;
+							boolean var47 = false;
+							int var48 = 0;
+							var45 = var95.getString(var0.hitSplatValues[var80]);
+							int var94 = var86.stringWidth(var45);
+							if (var81 != null) {
+								var46 = var81.getString(var0.hitSplatValues2[var80]);
+								var48 = var44.stringWidth(var46);
+							}
+
+							int var49 = 0;
+							int var50 = 0;
+							if (var23 > 0) {
+								if (var84 == null && var85 == null) {
+									var49 = 1;
+								} else {
+									var49 = var94 / var23 + 1;
+								}
+							}
+
+							if (var81 != null && var35 > 0) {
+								if (var32 == null && var33 == null) {
+									var50 = 1;
+								} else {
+									var50 = var48 / var35 + 1;
+								}
+							}
+
+							int var51 = 0;
+							int var52 = var51;
+							if (var22 > 0) {
+								var51 += var22;
+							}
+
+							var51 += 2;
+							int var53 = var51;
+							if (var24 > 0) {
+								var51 += var24;
+							}
+
+							int var54 = var51;
+							int var55 = var51;
+							int var56;
+							if (var23 > 0) {
+								var56 = var49 * var23;
+								var51 += var56;
+								var55 += (var56 - var94) / 2;
+							} else {
+								var51 += var94;
+							}
+
+							var56 = var51;
+							if (var25 > 0) {
+								var51 += var25;
+							}
+
+							int var57 = 0;
+							int var58 = 0;
+							int var59 = 0;
+							int var60 = 0;
+							int var61 = 0;
+							int var62;
+							if (var81 != null) {
+								var51 += 2;
+								var57 = var51;
+								if (var34 > 0) {
+									var51 += var34;
+								}
+
+								var51 += 2;
+								var58 = var51;
+								if (var36 > 0) {
+									var51 += var36;
+								}
+
+								var59 = var51;
+								var61 = var51;
+								if (var35 > 0) {
+									var62 = var35 * var50;
+									var51 += var62;
+									var61 += (var62 - var48) / 2;
+								} else {
+									var51 += var48;
+								}
+
+								var60 = var51;
+								if (var37 > 0) {
+									var51 += var37;
+								}
+							}
+
+							var62 = var0.hitSplatCycles[var80] - Client.cycle;
+							int var63 = var95.field3329 - var62 * var95.field3329 / var95.field3314;
+							int var64 = var62 * var95.field3315 / var95.field3314 + -var95.field3315;
+							int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1));
+							int var66 = var3 + Client.viewportTempY - 12 + var64;
+							int var67 = var66;
+							int var68 = var42 + var66;
+							int var69 = var66 + var95.field3330 + 15;
+							int var70 = var69 - var86.maxAscent;
+							int var71 = var69 + var86.maxDescent;
+							if (var70 < var66) {
+								var67 = var70;
+							}
+
+							if (var71 > var68) {
+								var68 = var71;
+							}
+
+							int var72 = 0;
+							int var73;
+							int var74;
+							if (var81 != null) {
+								var72 = var66 + var81.field3330 + 15;
+								var73 = var72 - var44.maxAscent;
+								var74 = var72 + var44.maxDescent;
+								if (var73 < var67) {
+									;
+								}
+
+								if (var74 > var68) {
+									;
+								}
+							}
+
+							var73 = 255;
+							if (var95.field3327 >= 0) {
+								var73 = (var62 << 8) / (var95.field3314 - var95.field3327);
+							}
+
+							if (var73 >= 0 && var73 < 255) {
+								if (var82 != null) {
+									var82.drawTransAt(var52 + var65 - var26, var66, var73);
+								}
+
+								if (var84 != null) {
+									var84.drawTransAt(var65 + var53 - var28, var66, var73);
+								}
+
+								if (var83 != null) {
+									for (var74 = 0; var74 < var49; ++var74) {
+										var83.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73);
+									}
+								}
+
+								if (var85 != null) {
+									var85.drawTransAt(var65 + var56 - var29, var66, var73);
+								}
+
+								var86.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73);
+								if (var81 != null) {
+									if (var30 != null) {
+										var30.drawTransAt(var65 + var57 - var38, var66, var73);
+									}
+
+									if (var32 != null) {
+										var32.drawTransAt(var65 + var58 - var40, var66, var73);
+									}
+
+									if (var31 != null) {
+										for (var74 = 0; var74 < var50; ++var74) {
+											var31.drawTransAt(var35 * var74 + (var65 + var59 - var39), var66, var73);
+										}
+									}
+
+									if (var33 != null) {
+										var33.drawTransAt(var60 + var65 - var41, var66, var73);
+									}
+
+									var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73);
+								}
+							} else {
+								if (var82 != null) {
+									var82.drawTransBgAt(var65 + var52 - var26, var66);
+								}
+
+								if (var84 != null) {
+									var84.drawTransBgAt(var65 + var53 - var28, var66);
+								}
+
+								if (var83 != null) {
+									for (var74 = 0; var74 < var49; ++var74) {
+										var83.drawTransBgAt(var23 * var74 + (var65 + var54 - var27), var66);
+									}
+								}
+
+								if (var85 != null) {
+									var85.drawTransBgAt(var65 + var56 - var29, var66);
+								}
+
+								var86.draw(var45, var55 + var65, var69, var95.textColor | -16777216, 0);
+								if (var81 != null) {
+									if (var30 != null) {
+										var30.drawTransBgAt(var57 + var65 - var38, var66);
+									}
+
+									if (var32 != null) {
+										var32.drawTransBgAt(var58 + var65 - var40, var66);
+									}
+
+									if (var31 != null) {
+										for (var74 = 0; var74 < var50; ++var74) {
+											var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66);
+										}
+									}
+
+									if (var33 != null) {
+										var33.drawTransBgAt(var60 + var65 - var41, var66);
+									}
+
+									var44.draw(var46, var65 + var61, var72, var81.textColor | -16777216, 0);
+								}
+							}
+						}
+					}
+				}
+			}
+
+		}
+	}
 }

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("dx")
+@ObfuscatedName("dg")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("position")
 	int position;
 

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

@@ -1,27 +1,29 @@
-import java.lang.management.GarbageCollectorMXBean;
 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("jr")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("ag")
+	@ObfuscatedName("rb")
-	@Export("garbageCollector")
+	@ObfuscatedGetter(
-	static GarbageCollectorMXBean garbageCollector;
+		intValue = -1217958016
-	@ObfuscatedName("n")
+	)
+	static int field3583;
+	@ObfuscatedName("t")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(Ljava/util/Comparator;B)V",
-		garbageValue = "0"
+		garbageValue = "115"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -33,10 +35,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljh;Ljh;B)I",
+		signature = "(Ljg;Ljg;B)I",
-		garbageValue = "-78"
+		garbageValue = "124"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {

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

@@ -4,116 +4,115 @@ 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("f")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("iz")
+	@ObfuscatedName("ae")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 742897815
+		signature = "Llu;"
 	)
-	@Export("selectedItemId")
+	@Export("rasterProvider")
-	static int selectedItemId;
+	public static AbstractRasterProvider rasterProvider;
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 461674944
+		intValue = 1032040448
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 278884352
+		intValue = 2012131328
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -317022193
+		intValue = 1049638377
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 796055175
+		intValue = 548799015
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 804294653
+		intValue = 974666319
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 593055761
+		intValue = 1744389767
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1864196889
+		intValue = -1592799997
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -644572197
+		intValue = -1573333695
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
-	byte[][][] field164;
+	byte[][][] field161;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
-	byte[][][] field152;
+	byte[][][] field157;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "[[[[Lk;"
+		signature = "[[[[Ly;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
-	boolean field165;
+	boolean field159;
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
-	boolean field166;
+	boolean field151;
 
 	AbstractWorldMapData() {
 		this.groupId = -1;
 		this.fileId = -1;
 		new LinkedList();
-		this.field165 = false;
+		this.field159 = false;
-		this.field166 = false;
+		this.field151 = false;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkl;I)V",
+		signature = "(Lkc;I)V",
-		garbageValue = "1549979331"
+		garbageValue = "1045041620"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1858482709"
+		garbageValue = "-992891082"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field165 && this.field166;
+		return this.field159 && this.field151;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Lhp;I)V",
+		signature = "(Lhq;I)V",
-		garbageValue = "-1207518623"
+		garbageValue = "126023316"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -121,53 +120,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
 			if (var2 != null) {
 				this.readGeography(new Buffer(var2));
-				this.field165 = true;
+				this.field159 = true;
-				this.field166 = true;
+				this.field151 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1757437769"
+		garbageValue = "124"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null;
 		this.floorOverlayIds = null;
-		this.field164 = null;
+		this.field161 = null;
-		this.field152 = null;
+		this.field157 = null;
 		this.decorations = null;
-		this.field165 = false;
+		this.field159 = false;
-		this.field166 = false;
+		this.field151 = false;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IILkl;B)V",
+		signature = "(IILkc;I)V",
-		garbageValue = "10"
+		garbageValue = "-2099963410"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte();
 		if (var4 != 0) {
 			if ((var4 & 1) != 0) {
-				this.method262(var1, var2, var3, var4);
+				this.method320(var1, var2, var3, var4);
 			} else {
-				this.method268(var1, var2, var3, var4);
+				this.method302(var1, var2, var3, var4);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(IILkl;II)V",
+		signature = "(IILkc;IB)V",
-		garbageValue = "2059676399"
+		garbageValue = "-1"
 	)
-	void method262(int var1, int var2, Buffer var3, int var4) {
+	void method320(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0;
 		if (var5) {
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
@@ -176,12 +175,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(IILkl;IB)V",
+		signature = "(IILkc;IB)V",
-		garbageValue = "-56"
+		garbageValue = "0"
 	)
-	void method268(int var1, int var2, Buffer var3, int var4) {
+	void method302(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1;
 		boolean var6 = (var4 & 2) != 0;
 		boolean var7 = (var4 & 4) != 0;
@@ -197,8 +196,8 @@ public abstract class AbstractWorldMapData {
 				if (var10 != 0) {
 					this.floorOverlayIds[var9][var1][var2] = (short)var10;
 					var11 = var3.readUnsignedByte();
-					this.field164[var9][var1][var2] = (byte)(var11 >> 2);
+					this.field161[var9][var1][var2] = (byte)(var11 >> 2);
-					this.field152[var9][var1][var2] = (byte)(var11 & 3);
+					this.field157[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -210,7 +209,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
 
 					for (var11 = 0; var11 < var9; ++var11) {
-						int var12 = var3.method5453();
+						int var12 = var3.method5638();
 						int var13 = var3.readUnsignedByte();
 						var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
 					}
@@ -220,232 +219,160 @@ public abstract class AbstractWorldMapData {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-929324026"
+		garbageValue = "80"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-2009466013"
+		garbageValue = "84"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IB)Liq;",
+		signature = "(Ljava/lang/CharSequence;I)Z",
-		garbageValue = "1"
+		garbageValue = "403966383"
 	)
-	public static VarpDefinition method288(int var0) {
+	@Export("isNumber")
-		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
+	public static boolean isNumber(CharSequence var0) {
-		if (var1 != null) {
+		boolean var2 = false;
-			return var1;
+		boolean var3 = false;
-		} else {
+		int var4 = 0;
-			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
+		int var5 = var0.length();
-			var1 = new VarpDefinition();
+		int var6 = 0;
-			if (var2 != null) {
+
-				var1.decode(new Buffer(var2));
+		boolean var1;
+		while (true) {
+			if (var6 >= var5) {
+				var1 = var3;
+				break;
 			}
 
-			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
+			label81: {
-			return var1;
+				char var7 = var0.charAt(var6);
-		}
+				if (var6 == 0) {
-	}
+					if (var7 == '-') {
+						var2 = true;
+						break label81;
+					}
 
-	@ObfuscatedName("r")
+					if (var7 == '+') {
-	@ObfuscatedSignature(
+						break label81;
-		signature = "(IIIZIZI)V",
+					}
-		garbageValue = "-1516072397"
-	)
-	@Export("doWorldSorting")
-	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-		if (var0 < var1) {
-			int var6 = (var0 + var1) / 2;
-			int var7 = var0;
-			World var8 = World.World_worlds[var6];
-			World.World_worlds[var6] = World.World_worlds[var1];
-			World.World_worlds[var1] = var8;
-
-			for (int var9 = var0; var9 < var1; ++var9) {
-				if (ArchiveLoader.method1174(World.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) {
-					World var10 = World.World_worlds[var9];
-					World.World_worlds[var9] = World.World_worlds[var7];
-					World.World_worlds[var7++] = var10;
 				}
-			}
 
-			World.World_worlds[var1] = World.World_worlds[var7];
+				int var9;
-			World.World_worlds[var7] = var8;
+				if (var7 >= '0' && var7 <= '9') {
-			doWorldSorting(var0, var7 - 1, var2, var3, var4, var5);
+					var9 = var7 - '0';
-			doWorldSorting(var7 + 1, var1, var2, var3, var4, var5);
+				} else if (var7 >= 'A' && var7 <= 'Z') {
-		}
+					var9 = var7 - '7';
-
-	}
-
-	@ObfuscatedName("ar")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
-		garbageValue = "-1561238800"
-	)
-	static int method289(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
-			return 1;
-		} else {
-			int var12;
-			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
-				return 1;
-			} else {
-				boolean var13;
-				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
-					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-					if (TileItem.grandExchangeEvents != null) {
-						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
-					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-					if (TileItem.grandExchangeEvents != null) {
-						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
-					Interpreter.Interpreter_intStackSize -= 2;
-					var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1;
-					boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1;
-					if (TileItem.grandExchangeEvents != null) {
-						Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
-						TileItem.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
-					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-					if (TileItem.grandExchangeEvents != null) {
-						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
-					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-					if (TileItem.grandExchangeEvents != null) {
-						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.grandExchangeEvents == null ? 0 : TileItem.grandExchangeEvents.events.size();
-					return 1;
 				} else {
-					GrandExchangeEvent var11;
+					if (var7 < 'a' || var7 > 'z') {
-					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
+						var1 = false;
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						break;
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getOfferName();
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						long var5 = class30.currentTimeMillis() - class81.field1135 - var11.age;
-						int var7 = (int)(var5 / 3600000L);
-						int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
-						int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
-						String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
-						return 1;
-					} else {
-						return 2;
 					}
+
+					var9 = var7 - 'W';
+				}
+
+				if (var9 >= 10) {
+					var1 = false;
+					break;
+				}
+
+				if (var2) {
+					var9 = -var9;
+				}
+
+				int var8 = var4 * 10 + var9;
+				if (var4 != var8 / 10) {
+					var1 = false;
+					break;
+				}
+
+				var4 = var8;
+				var3 = true;
+			}
+
+			++var6;
+		}
+
+		return var1;
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "693586906"
+	)
+	public static boolean method327(int var0) {
+		return (var0 >> 21 & 1) != 0;
+	}
+
+	@ObfuscatedName("hp")
+	@ObfuscatedSignature(
+		signature = "(ZLkf;I)V",
+		garbageValue = "1158282077"
+	)
+	@Export("updateNpcs")
+	static final void updateNpcs(boolean var0, PacketBuffer var1) {
+		Client.field752 = 0;
+		Client.field676 = 0;
+		class30.method606();
+		WorldMapManager.method710(var0, var1);
+		class160.method3586(var1);
+
+		int var2;
+		for (var2 = 0; var2 < Client.field752; ++var2) {
+			int var3 = Client.field870[var2];
+			if (Client.npcs[var3].npcCycle != Client.cycle) {
+				Client.npcs[var3].definition = null;
+				Client.npcs[var3] = null;
+			}
+		}
+
+		if (var1.offset != Client.packetWriter.serverPacketLength) {
+			throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+		} else {
+			for (var2 = 0; var2 < Client.npcCount; ++var2) {
+				if (Client.npcs[Client.npcIndices[var2]] == null) {
+					throw new RuntimeException(var2 + "," + Client.npcCount);
 				}
 			}
+
 		}
 	}
 
-	@ObfuscatedName("ii")
+	@ObfuscatedName("kw")
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIB)V",
+		signature = "(III)V",
-		garbageValue = "35"
+		garbageValue = "2048365157"
 	)
-	@Export("updateRootInterface")
+	static void method325(int var0, int var1) {
-	static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		MenuAction var2 = StudioGame.tempMenuAction;
-		if (WorldMapData_0.loadInterface(var0)) {
+		GrandExchangeOfferOwnWorldComparator.menuAction(var2.argument1, var2.argument2, var2.opcode, var2.argument0, var2.action, var2.action, var0, var1);
-			MusicPatchNode.updateInterface(UserComparator5.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6);
+		StudioGame.tempMenuAction = null;
+	}
+
+	@ObfuscatedName("kx")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "871169152"
+	)
+	static final void method326(int var0) {
+		if (TextureProvider.loadInterface(var0)) {
+			HealthBarDefinition.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1);
 		}
 	}
 }

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

@@ -4,84 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("as")
+@ObfuscatedName("am")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("h")
+	@ObfuscatedName("qa")
 	@ObfuscatedSignature(
-		signature = "Lkl;"
+		signature = "Ldo;"
 	)
-	@Export("NetCache_reference")
+	@Export("decimator")
-	static Buffer NetCache_reference;
+	static Decimator decimator;
-	@ObfuscatedName("q")
+	@ObfuscatedName("dz")
 	@ObfuscatedSignature(
-		signature = "Lhb;"
+		signature = "Lij;"
+	)
+	@Export("archive2")
+	static Archive archive2;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "Lhf;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lhb;"
+		signature = "Lhf;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -744946711
+		intValue = 2101295301
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1215104535
+		intValue = 1809390745
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		signature = "(Lhb;Lhb;)V"
+		signature = "(Lhf;Lhf;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "16"
+		garbageValue = "-1878632225"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Law;",
+		signature = "(I)Lar;",
-		garbageValue = "13348956"
+		garbageValue = "-77909992"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-175699296"
+		garbageValue = "60677286"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "806304417"
+		garbageValue = "-92"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "1521252994"
+		garbageValue = "1408503186"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -92,44 +98,43 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "36"
+		garbageValue = "1618081006"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "-2112119378"
+		garbageValue = "471623513"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = Decimator.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = class65.WorldMapElement_get(this.getElement());
 			int var4 = this.getSubWidth();
 			int var5 = this.getSubHeight();
 			switch(var3.horizontalAlignment.value) {
 			case 0:
-				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
+				if (var1 <= this.screenX - var4 || var1 > this.screenX) {
-					break;
+					return false;
 				}
-
+				break;
-				return false;
 			case 1:
-				if (var1 > this.screenX - var4 && var1 <= this.screenX) {
+				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
 					break;
 				}
 
 				return false;
 			case 2:
-				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
+				if (var1 < this.screenX || var1 >= var4 + this.screenX) {
 					return false;
 				}
 			}
@@ -141,12 +146,12 @@ public abstract class AbstractWorldMapIcon {
 				}
 				break;
 			case 1:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
 					return false;
 				}
 				break;
 			case 2:
-				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
 					return false;
 				}
 			}
@@ -155,10 +160,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
+		signature = "(III)Z",
-		garbageValue = "122"
+		garbageValue = "1082527847"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -166,79 +171,52 @@ public abstract class AbstractWorldMapIcon {
 		if (var3 == null) {
 			return false;
 		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
-			return var2 >= this.screenY && var2 <= this.screenY + var3.height;
+			return var2 >= this.screenY && var2 <= var3.height + this.screenY;
 		} else {
 			return false;
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		signature = "([BILjava/lang/CharSequence;I)I",
-		garbageValue = "1746697865"
-	)
-	public static int method640(byte[] var0, int var1, CharSequence var2) {
-		int var3 = var2.length();
-		int var4 = var1;
-
-		for (int var5 = 0; var5 < var3; ++var5) {
-			char var6 = var2.charAt(var5);
-			if (var6 <= 127) {
-				var0[var4++] = (byte)var6;
-			} else if (var6 <= 2047) {
-				var0[var4++] = (byte)(192 | var6 >> 6);
-				var0[var4++] = (byte)(128 | var6 & '?');
-			} else {
-				var0[var4++] = (byte)(224 | var6 >> '\f');
-				var0[var4++] = (byte)(128 | var6 >> 6 & 63);
-				var0[var4++] = (byte)(128 | var6 & '?');
-			}
-		}
-
-		return var4 - var1;
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(I)[Llf;",
-		garbageValue = "-1750401163"
-	)
-	static Sprite[] method642() {
-		Sprite[] var0 = new Sprite[class325.SpriteBuffer_spriteCount];
-
-		for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) {
-			Sprite var2 = var0[var1] = new Sprite();
-			var2.width = class325.SpriteBuffer_spriteWidth;
-			var2.height = Frames.SpriteBuffer_spriteHeight;
-			var2.xOffset = class325.SpriteBuffer_xOffsets[var1];
-			var2.yOffset = MusicPatchPcmStream.SpriteBuffer_yOffsets[var1];
-			var2.subWidth = class325.SpriteBuffer_spriteWidths[var1];
-			var2.subHeight = RunException.SpriteBuffer_spriteHeights[var1];
-			int var3 = var2.subHeight * var2.subWidth;
-			byte[] var4 = PacketBufferNode.SpriteBuffer_pixels[var1];
-			var2.pixels = new int[var3];
-
-			for (int var5 = 0; var5 < var3; ++var5) {
-				var2.pixels[var5] = class325.SpriteBuffer_spritePalette[var4[var5] & 255];
-			}
-		}
-
-		class325.SpriteBuffer_xOffsets = null;
-		MusicPatchPcmStream.SpriteBuffer_yOffsets = null;
-		class325.SpriteBuffer_spriteWidths = null;
-		RunException.SpriteBuffer_spriteHeights = null;
-		class325.SpriteBuffer_spritePalette = null;
-		PacketBufferNode.SpriteBuffer_pixels = null;
-		return var0;
-	}
-
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(CI)Z",
-		garbageValue = "431385014"
+		garbageValue = "93178768"
 	)
-	@Export("isDigit")
+	static boolean method679(char var0) {
-	public static boolean isDigit(char var0) {
+		return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1;
-		return var0 >= '0' && var0 <= '9';
+	}
+
+	@ObfuscatedName("fa")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "30161399"
+	)
+	static final void method652() {
+		if (Client.logoutTimer > 0) {
+			class1.logOut();
+		} else {
+			Client.timer.method5123();
+			Tile.updateGameState(40);
+			Tiles.field499 = Client.packetWriter.getSocket();
+			Client.packetWriter.removeSocket();
+		}
+	}
+
+	@ObfuscatedName("fo")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "542479713"
+	)
+	@Export("playSong")
+	static void playSong(int var0) {
+		if (var0 == -1 && !Client.field855) {
+			class197.midiPcmStream.clear();
+			class197.field2377 = 1;
+			class247.musicTrackArchive = null;
+		} else if (var0 != -1 && var0 != Client.field865 && Client.field864 != 0 && !Client.field855) {
+			WorldMapIcon_0.method253(2, class216.archive6, var0, 0, Client.field864, false);
+		}
+
+		Client.field865 = var0;
 	}
 }

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

@@ -12,24 +12,24 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("mh")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = 4557235660739599375L
+		longValue = 6718173947913803383L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = 2697348286360897637L
+		longValue = -8033630762525345541L
 	)
 	@Export("offset")
 	long offset;
 
 	public AccessFile(File var1, String var2, long var3) throws IOException {
-		if (-1L == var3) {
+		if (var3 == -1L) {
 			var3 = Long.MAX_VALUE;
 		}
 
@@ -49,21 +49,21 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "988503907"
+		garbageValue = "-1742010354"
 	)
 	@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("n")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "546615303"
+		garbageValue = "-87"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
+		signature = "(ZS)V",
-		garbageValue = "1331216421"
+		garbageValue = "26740"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)J",
+		signature = "(B)J",
-		garbageValue = "773958711"
+		garbageValue = "-60"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "([BIII)I",
+		signature = "([BIIB)I",
-		garbageValue = "-26512267"
+		garbageValue = "2"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {

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

@@ -4,319 +4,326 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("by")
+@ObfuscatedName("bz")
 @Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("aa")
+	@ObfuscatedName("eu")
+	@ObfuscatedSignature(
+		signature = "Lij;"
+	)
+	@Export("archive20")
+	static Archive archive20;
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -1124819045
+		intValue = 1673440105
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 682054857
+		intValue = -86496457
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1546716831
+		intValue = -1022004991
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ak")
 	@Export("isWalking")
 	boolean isWalking;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("av")
-	@Export("size")
-	int size;
-	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -334562759
+		intValue = 1414687121
+	)
+	int field927;
+	@ObfuscatedName("am")
+	@ObfuscatedGetter(
+		intValue = 222387089
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = 1344678569
+		intValue = -1677804381
 	)
 	@Export("readySequence")
 	int readySequence;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 1716804711
+		intValue = 594336323
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1564906087
+		intValue = 1154441065
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1786260681
+		intValue = 83349541
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 864493635
+		intValue = 1700088935
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 632813703
+		intValue = -781057529
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -67215047
+		intValue = -1829521957
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 1501032191
+		intValue = -2016822393
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("an")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("av")
+	@ObfuscatedName("af")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ay")
-	boolean field944;
+	boolean field939;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -1435944093
+		intValue = 1235378121
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 402893763
+		intValue = -696280171
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 2008647289
+		intValue = -1688504189
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("af")
+	@ObfuscatedName("at")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("at")
+	@ObfuscatedName("as")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ba")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bg")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bc")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bd")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		signature = "Ljs;"
+		signature = "Ljm;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = -173770189
+		intValue = -2097579951
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bh")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -708767615
+		intValue = -1107390821
 	)
-	int field957;
+	int field934;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 592854061
+		intValue = -1581860297
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 1334696243
+		intValue = 1528888905
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -1979514767
+		intValue = -687202097
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = -1879648645
+		intValue = 805247977
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = -1726927213
+		intValue = 736502107
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = 1584241957
+		intValue = -420296753
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 1536092043
+		intValue = 336768917
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -807055771
+		intValue = -1410322499
 	)
-	int field965;
+	int field960;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = -759724979
+		intValue = 1228903613
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("by")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 1088352163
+		intValue = 1265033073
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = -340493791
+		intValue = -663316133
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bk")
 	@ObfuscatedGetter(
-		intValue = 2083696993
+		intValue = -1273295849
-	)
-	int field969;
-	@ObfuscatedName("br")
-	@ObfuscatedGetter(
-		intValue = 2099588065
-	)
-	@Export("heightOffset")
-	int heightOffset;
-	@ObfuscatedName("bl")
-	@ObfuscatedGetter(
-		intValue = 337038295
-	)
-	int field971;
-	@ObfuscatedName("bf")
-	@ObfuscatedGetter(
-		intValue = -1218021367
-	)
-	int field972;
-	@ObfuscatedName("bg")
-	@ObfuscatedGetter(
-		intValue = -1028826911
 	)
 	int field973;
+	@ObfuscatedName("bv")
+	@ObfuscatedGetter(
+		intValue = 528591249
+	)
+	int field965;
 	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = 682547279
+		intValue = 1608804509
 	)
-	int field974;
+	int field966;
+	@ObfuscatedName("bb")
+	@ObfuscatedGetter(
+		intValue = -164988469
+	)
+	int field967;
+	@ObfuscatedName("bf")
+	@ObfuscatedGetter(
+		intValue = -1333983147
+	)
+	int field979;
+	@ObfuscatedName("by")
+	@ObfuscatedGetter(
+		intValue = 105474701
+	)
+	int field969;
 	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = 647023113
+		intValue = 1769569101
 	)
-	int field948;
+	int field925;
-	@ObfuscatedName("cz")
+	@ObfuscatedName("cx")
 	@ObfuscatedGetter(
-		intValue = -521720929
+		intValue = 1506809691
 	)
-	int field976;
+	int field971;
-	@ObfuscatedName("ck")
-	@ObfuscatedGetter(
-		intValue = 2050032535
-	)
-	int field977;
 	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = 1347834439
+		intValue = 1295543135
+	)
+	int field972;
+	@ObfuscatedName("ce")
+	@ObfuscatedGetter(
+		intValue = 1559943605
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = -1864995671
+		intValue = 320863757
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = -459931913
+		intValue = -1451956301
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cg")
-	@ObfuscatedGetter(
-		intValue = -1988821201
-	)
-	int field981;
 	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1277282795
+		intValue = 477550871
 	)
-	int field982;
+	int field948;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cr")
 	@ObfuscatedGetter(
-		intValue = -948674291
+		intValue = 1785171989
+	)
+	int field977;
+	@ObfuscatedName("ci")
+	@ObfuscatedGetter(
+		intValue = 2075263543
 	)
 	@Export("pathLength")
 	int pathLength;
 	@ObfuscatedName("cy")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("cl")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("co")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = 2121676837
+		intValue = -2083065961
 	)
-	int field949;
+	int field982;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cz")
 	@ObfuscatedGetter(
-		intValue = -207338457
+		intValue = 1810694977
 	)
-	int field988;
+	int field983;
 
 	Actor() {
 		this.isWalking = false;
-		this.size = 772175475;
+		this.field927 = 1;
 		this.readySequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -326,7 +333,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field944 = false;
+		this.field939 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -339,7 +346,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field957 = -1;
+		this.field934 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -347,46 +354,46 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field965 = 0;
+		this.field960 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field981 = 0;
+		this.field948 = 0;
-		this.field982 = 32;
+		this.field977 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field949 = 0;
+		this.field982 = 0;
-		this.field988 = 0;
+		this.field983 = 0;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(B)Z",
-		garbageValue = "180"
+		garbageValue = "-25"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("bu")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "4"
+		garbageValue = "0"
 	)
-	final void method1765() {
+	final void method1862() {
 		this.pathLength = 0;
-		this.field988 = 0;
+		this.field983 = 0;
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "341931021"
+		garbageValue = "-506913236"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -406,52 +413,38 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1);
+			HitSplatDefinition var12 = NetFileRequest.method4298(var1);
-			HitSplatDefinition var12;
+			var10 = var12.field3313;
-			if (var13 != null) {
+			var11 = var12.field3314;
-				var12 = var13;
-			} else {
-				byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1);
-				var13 = new HitSplatDefinition();
-				if (var14 != null) {
-					var13.decode(new Buffer(var14));
-				}
-
-				HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1);
-				var12 = var13;
-			}
-
-			var10 = var12.field3327;
-			var11 = var12.field3318;
 		}
 
-		int var15;
+		int var14;
 		if (var8) {
 			if (var10 == -1) {
 				return;
 			}
 
 			var9 = 0;
-			var15 = 0;
+			var14 = 0;
 			if (var10 == 0) {
-				var15 = this.hitSplatCycles[0];
+				var14 = this.hitSplatCycles[0];
 			} else if (var10 == 1) {
-				var15 = this.hitSplatValues[0];
+				var14 = this.hitSplatValues[0];
 			}
 
-			for (int var16 = 1; var16 < 4; ++var16) {
+			for (int var13 = 1; var13 < 4; ++var13) {
 				if (var10 == 0) {
-					if (this.hitSplatCycles[var16] < var15) {
+					if (this.hitSplatCycles[var13] < var14) {
-						var9 = var16;
+						var9 = var13;
-						var15 = this.hitSplatCycles[var16];
+						var14 = this.hitSplatCycles[var13];
 					}
-				} else if (var10 == 1 && this.hitSplatValues[var16] < var15) {
+				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) {
-					var9 = var16;
+					var9 = var13;
-					var15 = this.hitSplatValues[var16];
+					var14 = this.hitSplatValues[var13];
 				}
 			}
 
-			if (var10 == 1 && var15 >= var2) {
+			if (var10 == 1 && var14 >= var2) {
 				return;
 			}
 		} else {
@@ -459,11 +452,11 @@ public abstract class Actor extends Entity {
 				this.hitSplatCount = 0;
 			}
 
-			for (var15 = 0; var15 < 4; ++var15) {
+			for (var14 = 0; var14 < 4; ++var14) {
-				byte var17 = this.hitSplatCount;
+				byte var15 = this.hitSplatCount;
 				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
-				if (this.hitSplatCycles[var17] <= var5) {
+				if (this.hitSplatCycles[var15] <= var5) {
-					var9 = var17;
+					var9 = var15;
 					break;
 				}
 			}
@@ -478,10 +471,10 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
 		signature = "(IIIIIIB)V",
-		garbageValue = "31"
+		garbageValue = "-38"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -509,7 +502,7 @@ public abstract class Actor extends Entity {
 		HealthBar var13;
 		for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
 			++var12;
-			if (var13.definition.field3258 == var8.field3258) {
+			if (var13.definition.field3265 == var8.field3265) {
 				var13.put(var2 + var4, var5, var6, var3);
 				return;
 			}
@@ -540,10 +533,10 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1895868902"
+		garbageValue = "-1507831115"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
@@ -572,4 +565,85 @@ public abstract class Actor extends Entity {
 		}
 
 	}
+
+	@ObfuscatedName("gj")
+	@ObfuscatedSignature(
+		signature = "(Lbz;S)V",
+		garbageValue = "16384"
+	)
+	static final void method1873(Actor var0) {
+		if (var0.field977 != 0) {
+			if (var0.targetIndex != -1) {
+				Object var1 = null;
+				if (var0.targetIndex < 32768) {
+					var1 = Client.npcs[var0.targetIndex];
+				} else if (var0.targetIndex >= 32768) {
+					var1 = Client.players[var0.targetIndex - 32768];
+				}
+
+				if (var1 != null) {
+					int var2 = var0.x - ((Actor)var1).x;
+					int var3 = var0.y - ((Actor)var1).y;
+					if (var2 != 0 || var3 != 0) {
+						var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
+					}
+				} else if (var0.false0) {
+					var0.targetIndex = -1;
+					var0.false0 = false;
+				}
+			}
+
+			if (var0.field934 != -1 && (var0.pathLength == 0 || var0.field982 > 0)) {
+				var0.orientation = var0.field934;
+				var0.field934 = -1;
+			}
+
+			int var4 = var0.orientation - var0.rotation & 2047;
+			if (var4 == 0 && var0.false0) {
+				var0.targetIndex = -1;
+				var0.false0 = false;
+			}
+
+			if (var4 != 0) {
+				++var0.field948;
+				boolean var6;
+				if (var4 > 1024) {
+					var0.rotation -= var0.field977;
+					var6 = true;
+					if (var4 < var0.field977 || var4 > 2048 - var0.field977) {
+						var0.rotation = var0.orientation;
+						var6 = false;
+					}
+
+					if (var0.readySequence == var0.movementSequence && (var0.field948 > 25 || var6)) {
+						if (var0.turnLeftSequence != -1) {
+							var0.movementSequence = var0.turnLeftSequence;
+						} else {
+							var0.movementSequence = var0.walkSequence;
+						}
+					}
+				} else {
+					var0.rotation += var0.field977;
+					var6 = true;
+					if (var4 < var0.field977 || var4 > 2048 - var0.field977) {
+						var0.rotation = var0.orientation;
+						var6 = false;
+					}
+
+					if (var0.readySequence == var0.movementSequence && (var0.field948 > 25 || var6)) {
+						if (var0.turnRightSequence != -1) {
+							var0.movementSequence = var0.turnRightSequence;
+						} else {
+							var0.movementSequence = var0.walkSequence;
+						}
+					}
+				}
+
+				var0.rotation &= 2047;
+			} else {
+				var0.field948 = 0;
+			}
+
+		}
+	}
 }

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("da")
+@ObfuscatedName("dw")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
-	static int[] field1607;
+	static int[] field1609;
+	@ObfuscatedName("t")
+	static int[] field1611;
 	@ObfuscatedName("n")
-	static int[] field1598;
+	static int[] field1618;
+	@ObfuscatedName("q")
+	static int[] field1610;
 	@ObfuscatedName("v")
-	static int[] field1597;
-	@ObfuscatedName("u")
-	static int[] field1600;
-	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Lew;"
+		signature = "Lee;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field1607 = new int[500];
+		field1609 = new int[500];
-		field1598 = new int[500];
+		field1611 = new int[500];
-		field1597 = new int[500];
+		field1618 = new int[500];
-		field1600 = new int[500];
+		field1610 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		signature = "([BLew;)V"
+		signature = "([BLee;)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) {
-							field1607[var7] = var10;
+							field1609[var7] = var10;
-							field1598[var7] = 0;
+							field1611[var7] = 0;
-							field1597[var7] = 0;
+							field1618[var7] = 0;
-							field1600[var7] = 0;
+							field1610[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field1607[var7] = var8;
+				field1609[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field1598[var7] = var4.readShortSmart();
+					field1611[var7] = var4.readShortSmart();
 				} else {
-					field1598[var7] = var11;
+					field1611[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field1597[var7] = var4.readShortSmart();
+					field1618[var7] = var4.readShortSmart();
 				} else {
-					field1597[var7] = var11;
+					field1618[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field1600[var7] = var4.readShortSmart();
+					field1610[var7] = var4.readShortSmart();
 				} else {
-					field1600[var7] = var11;
+					field1610[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] = field1607[var8];
+				this.transformSkeletonLabels[var8] = field1609[var8];
-				this.transformXs[var8] = field1598[var8];
+				this.transformXs[var8] = field1611[var8];
-				this.transformYs[var8] = field1597[var8];
+				this.transformYs[var8] = field1618[var8];
-				this.transformZs[var8] = field1600[var8];
+				this.transformZs[var8] = field1610[var8];
 			}
 
 		}

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

@@ -5,216 +5,228 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ie")
+@ObfuscatedName("ij")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ar")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("jn")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ldz;"
+		signature = "Lke;"
-	)
-	@Export("textureProvider")
-	static TextureProvider textureProvider;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "Lkg;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("d")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lkg;"
+		signature = "Lke;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -341991117
+		intValue = -697196869
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("k")
+	@ObfuscatedName("y")
-	volatile boolean field3131;
+	volatile boolean field3145;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aa")
-	boolean field3129;
+	boolean field3139;
-	@ObfuscatedName("az")
+	@ObfuscatedName("aw")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 2033402119
+		intValue = 1007467833
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -302073813
+		intValue = -722952975
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -630367829
+		intValue = 372476733
 	)
-	int field3137;
+	int field3148;
 
 	static {
 		Archive_crc = new CRC32();
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkg;Lkg;IZZZ)V"
+		signature = "(Lke;Lke;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3131 = false;
+		this.field3145 = false;
-		this.field3129 = false;
+		this.field3139 = false;
-		this.field3137 = -1;
+		this.field3148 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3129 = var6;
+		this.field3139 = var6;
 		int var8 = this.index;
-		if (AbstractWorldMapIcon.NetCache_reference != null) {
+		if (Calendar.NetCache_reference != null) {
-			AbstractWorldMapIcon.NetCache_reference.offset = var8 * 8 + 5;
+			Calendar.NetCache_reference.offset = var8 * 8 + 5;
-			int var9 = AbstractWorldMapIcon.NetCache_reference.readInt();
+			int var9 = Calendar.NetCache_reference.readInt();
-			int var10 = AbstractWorldMapIcon.NetCache_reference.readInt();
+			int var10 = Calendar.NetCache_reference.readInt();
 			this.loadIndex(var9, var10);
 		} else {
-			WorldMapDecoration.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
+			BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
 			NetCache.NetCache_archives[var8] = this;
 		}
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IB)V",
-		garbageValue = "15"
+		garbageValue = "117"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
-		int var2 = this.index;
+		Tile.method3021(this.index, var1);
-		long var3 = (long)((var2 << 16) + var1);
-		NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
-		if (var5 != null) {
-			NetCache.NetCache_pendingWritesQueue.addLast(var5);
-		}
-
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-2030453035"
+		garbageValue = "-778670663"
 	)
 	@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;
+			return this.validGroups[var1] ? 100 : PcmPlayer.method2638(this.index, var1);
-			long var4 = (long)((var3 << 16) + var1);
-			int var2;
-			if (WorldMapEvent.NetCache_currentResponse != null && WorldMapEvent.NetCache_currentResponse.key == var4) {
-				var2 = FaceNormal.NetCache_responseArchiveBuffer.offset * 99 / (FaceNormal.NetCache_responseArchiveBuffer.array.length - WorldMapEvent.NetCache_currentResponse.padding) + 1;
-			} else {
-				var2 = 0;
-			}
-
-			return var2;
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "848617854"
+		garbageValue = "664192835"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			WorldMapArea.method429(var1, this.archiveDisk, this);
+			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 (var6.key == (long)var1 && 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 {
-			WorldMapDecoration.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+		}
+
+	}
+
+	@ObfuscatedName("dm")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "1944128769"
+	)
+	public boolean method4409() {
+		return this.field3145;
+	}
+
+	@ObfuscatedName("di")
+	@ObfuscatedSignature(
+		signature = "(I)I",
+		garbageValue = "1888934237"
+	)
+	@Export("percentage")
+	public int percentage() {
+		if (this.field3145) {
+			return 100;
+		} else if (super.groups != null) {
+			return 99;
+		} else {
+			int var1 = PcmPlayer.method2638(255, this.index);
+			if (var1 >= 100) {
+				var1 = 99;
+			}
+
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("dn")
+	@ObfuscatedSignature(
+		signature = "(III)V",
+		garbageValue = "1627267757"
+	)
+	@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 (var8.key == (long)var3 && 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 {
+			BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}
 
 	}
 
 	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(I[BZZB)V",
-		garbageValue = "2035998705"
+		garbageValue = "4"
-	)
-	public boolean method4235() {
-		return this.field3131;
-	}
-
-	@ObfuscatedName("du")
-	@ObfuscatedSignature(
-		signature = "(I)I",
-		garbageValue = "1744835603"
-	)
-	@Export("percentage")
-	public int percentage() {
-		if (this.field3131) {
-			return 100;
-		} else if (super.groups != null) {
-			return 99;
-		} else {
-			int var2 = this.index;
-			long var3 = (long)(var2 + 16711680);
-			int var1;
-			if (WorldMapEvent.NetCache_currentResponse != null && WorldMapEvent.NetCache_currentResponse.key == var3) {
-				var1 = FaceNormal.NetCache_responseArchiveBuffer.offset * 99 / (FaceNormal.NetCache_responseArchiveBuffer.array.length - WorldMapEvent.NetCache_currentResponse.padding) + 1;
-			} else {
-				var1 = 0;
-			}
-
-			int var5 = var1;
-			if (var1 >= 100) {
-				var5 = 99;
-			}
-
-			return var5;
-		}
-	}
-
-	@ObfuscatedName("ds")
-	@ObfuscatedSignature(
-		signature = "(III)V",
-		garbageValue = "684167120"
-	)
-	@Export("loadIndex")
-	void loadIndex(int var1, int var2) {
-		this.indexCrc = var1;
-		this.indexVersion = var2;
-		if (this.masterDisk != null) {
-			WorldMapArea.method429(this.index, this.masterDisk, this);
-		} else {
-			WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-		}
-
-	}
-
-	@ObfuscatedName("dc")
-	@ObfuscatedSignature(
-		signature = "(I[BZZI)V",
-		garbageValue = "1316980907"
 	)
 	@Export("write")
-	void write(int var1, byte[] var2, boolean var3, boolean var4) {
+	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3131) {
+			if (this.field3145) {
 				throw new RuntimeException();
 			}
 
 			if (this.masterDisk != null) {
-				CollisionMap.method3536(this.index, var2, this.masterDisk);
+				int var5 = this.index;
+				ArchiveDisk var6 = this.masterDisk;
+				ArchiveDiskAction var7 = new ArchiveDiskAction();
+				var7.type = 0;
+				var7.key = (long)var5;
+				var7.data = var2;
+				var7.archiveDisk = var6;
+				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7);
+				}
+
+				ItemContainer.method1250();
 			}
 
 			this.decodeIndex(var2);
@@ -223,32 +235,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) {
-				CollisionMap.method3536(var1, var2, this.archiveDisk);
+				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(var14);
+				}
+
+				ItemContainer.method1250();
 				this.validGroups[var1] = true;
 			}
 
 			if (var4) {
-				super.groups[var1] = GrandExchangeEvents.method76(var2, false);
+				super.groups[var1] = MusicPatchPcmStream.method4064(var2, false);
 			}
 		}
 
 	}
 
-	@ObfuscatedName("di")
+	@ObfuscatedName("do")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I[BZB)V",
+		signature = "(Lke;I[BZI)V",
-		garbageValue = "1"
+		garbageValue = "-1897627904"
 	)
 	@Export("load")
 	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3131) {
+			if (this.field3145) {
 				throw new RuntimeException();
 			}
 
 			if (var3 == null) {
-				WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
@@ -256,11 +278,11 @@ public class Archive extends AbstractArchive {
 			Archive_crc.update(var3, 0, var3.length);
 			var5 = (int)Archive_crc.getValue();
 			if (var5 != this.indexCrc) {
-				WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
-			Buffer var9 = new Buffer(MusicPatch.decompressBytes(var3));
+			Buffer var9 = new Buffer(ArchiveLoader.decompressBytes(var3));
 			int var7 = var9.readUnsignedByte();
 			if (var7 != 5 && var7 != 6) {
 				throw new RuntimeException(var7 + "," + this.index + "," + var2);
@@ -272,21 +294,21 @@ public class Archive extends AbstractArchive {
 			}
 
 			if (var8 != this.indexVersion) {
-				WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
 			this.decodeIndex(var3);
 			this.loadAllLocal();
 		} else {
-			if (!var4 && var2 == this.field3137) {
+			if (!var4 && var2 == this.field3148) {
-				this.field3131 = true;
+				this.field3145 = true;
 			}
 
 			if (var3 == null || var3.length <= 2) {
 				this.validGroups[var2] = false;
-				if (this.field3129 || var4) {
+				if (this.field3139 || var4) {
-					WorldMapDecoration.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -298,8 +320,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.field3129 || var4) {
+				if (this.field3139 || var4) {
-					WorldMapDecoration.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -307,16 +329,16 @@ public class Archive extends AbstractArchive {
 
 			this.validGroups[var2] = true;
 			if (var4) {
-				super.groups[var2] = GrandExchangeEvents.method76(var3, false);
+				super.groups[var2] = MusicPatchPcmStream.method4064(var3, false);
 			}
 		}
 
 	}
 
-	@ObfuscatedName("dk")
+	@ObfuscatedName("ds")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "8"
+		garbageValue = "0"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -328,9 +350,9 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3131 = true;
+			this.field3145 = true;
 		} else {
-			this.field3137 = -1;
+			this.field3148 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
@@ -344,50 +366,40 @@ public class Archive extends AbstractArchive {
 						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4);
 					}
 
-					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+					ItemContainer.method1250();
-						if (ArchiveDiskActionHandler.field3127 == 0) {
+					this.field3148 = var1;
-							UserComparator5.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-							UserComparator5.ArchiveDiskActionHandler_thread.setDaemon(true);
-							UserComparator5.ArchiveDiskActionHandler_thread.start();
-							UserComparator5.ArchiveDiskActionHandler_thread.setPriority(5);
-						}
-
-						ArchiveDiskActionHandler.field3127 = 600;
-					}
-
-					this.field3137 = var1;
 				}
 			}
 
-			if (this.field3137 == -1) {
+			if (this.field3148 == -1) {
-				this.field3131 = true;
+				this.field3145 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("dx")
-	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "-433634856"
-	)
-	public boolean method4243(int var1) {
-		return this.validGroups[var1];
-	}
-
 	@ObfuscatedName("dz")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "805361618"
+		garbageValue = "139739095"
 	)
-	public boolean method4244(int var1) {
+	public boolean method4417(int var1) {
+		return this.validGroups[var1];
+	}
+
+	@ObfuscatedName("dj")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "308980057"
+	)
+	public boolean method4436(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("do")
+	@ObfuscatedName("df")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "727894645"
+		garbageValue = "52"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -409,36 +421,4 @@ public class Archive extends AbstractArchive {
 			return var3;
 		}
 	}
-
-	@ObfuscatedName("jq")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-212508230"
-	)
-	static final void method4278() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
-			Player var1 = Client.players[Players.Players_indices[var0]];
-			var1.clearIsInClanChat();
-		}
-
-	}
-
-	@ObfuscatedName("km")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "26372698"
-	)
-	static void method4250() {
-		if (StudioGame.field3086 != null) {
-			Client.field905 = Client.cycle;
-			StudioGame.field3086.method4300();
-
-			for (int var0 = 0; var0 < Client.players.length; ++var0) {
-				if (Client.players[var0] != null) {
-					StudioGame.field3086.method4301(class223.baseX * 64 + (Client.players[var0].x >> 7), class286.baseY * 64 + (Client.players[var0].y >> 7));
-				}
-			}
-		}
-
-	}
 }

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

@@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kg")
+@ObfuscatedName("ke")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lmm;"
+		signature = "Lmz;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lmm;"
+		signature = "Lmz;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 558641831
+		intValue = 161703877
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1322039527
+		intValue = -1904076189
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -42,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(ILmm;Lmm;I)V"
+		signature = "(ILmz;Lmz;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null;
@@ -54,10 +54,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IB)[B",
+		signature = "(II)[B",
-		garbageValue = "1"
+		garbageValue = "909989456"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -89,7 +89,7 @@ public final class ArchiveDisk {
 								return (byte[])var10000;
 							}
 
-							this.datFile.seek((long)var4 * 520L);
+							this.datFile.seek(520L * (long)var4);
 							int var8 = var3 - var6;
 							int var9;
 							int var10;
@@ -102,7 +102,7 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 10;
-								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
+								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
 								var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
 								var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8);
 								var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16);
@@ -120,7 +120,7 @@ public final class ArchiveDisk {
 								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 = var13 + var8;
 
@@ -151,10 +151,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I[BII)Z",
-		garbageValue = "-1069570750"
+		garbageValue = "434454104"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -172,10 +172,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I[BIZI)Z",
-		garbageValue = "1005578949"
+		garbageValue = "-498922457"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -216,7 +216,7 @@ public final class ArchiveDisk {
 
 				while (true) {
 					if (var7 < var3) {
-						label171: {
+						label170: {
 							int var9 = 0;
 							int var10;
 							if (var4) {
@@ -227,7 +227,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10);
 									} catch (EOFException var17) {
-										break label171;
+										break label170;
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
@@ -238,7 +238,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8);
 									} catch (EOFException var16) {
-										break label171;
+										break label170;
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
@@ -265,7 +265,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var9 == var6) {
+								if (var6 == var9) {
 									++var9;
 								}
 							}
@@ -285,7 +285,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[7] = (byte)(var9 >> 8);
 								ArchiveDisk_buffer[8] = (byte)var9;
 								ArchiveDisk_buffer[9] = (byte)this.archive;
-								this.datFile.seek(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								this.datFile.write(ArchiveDisk_buffer, 0, 10);
 								var10 = var3 - var7;
 								if (var10 > 510) {
@@ -336,123 +336,4 @@ public final class ArchiveDisk {
 	public String toString() {
 		return "" + this.archive;
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(Lkl;Ljava/lang/String;I)I",
-		garbageValue = "1895940511"
-	)
-	public static int method5796(Buffer var0, String var1) {
-		int var2 = var0.offset;
-		byte[] var3 = UserComparator3.method3394(var1);
-		var0.writeSmartByteShort(var3.length);
-		var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
-		return var0.offset - var2;
-	}
-
-	@ObfuscatedName("el")
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "1355807172"
-	)
-	@Export("getLoginError")
-	static void getLoginError(int var0) {
-		if (var0 == -3) {
-			PlayerType.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
-		} else if (var0 == -2) {
-			PlayerType.setLoginResponseString("", "Error connecting to server.", "");
-		} else if (var0 == -1) {
-			PlayerType.setLoginResponseString("No response from server.", "Please try using a different world.", "");
-		} else if (var0 == 3) {
-			Login.loginIndex = 3;
-			Login.field1171 = 1;
-		} else if (var0 == 4) {
-			Login.loginIndex = 12;
-			Login.field1174 = 0;
-		} else if (var0 == 5) {
-			Login.field1171 = 2;
-			PlayerType.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes.");
-		} else if (var0 == 68 || !Client.onMobile && var0 == 6) {
-			PlayerType.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", "");
-		} else if (var0 == 7) {
-			PlayerType.setLoginResponseString("This world is full.", "Please use a different world.", "");
-		} else if (var0 == 8) {
-			PlayerType.setLoginResponseString("Unable to connect.", "Login server offline.", "");
-		} else if (var0 == 9) {
-			PlayerType.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
-		} else if (var0 == 10) {
-			PlayerType.setLoginResponseString("Unable to connect.", "Bad session id.", "");
-		} else if (var0 == 11) {
-			PlayerType.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
-		} else if (var0 == 12) {
-			PlayerType.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
-		} else if (var0 == 13) {
-			PlayerType.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
-		} else if (var0 == 14) {
-			PlayerType.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
-		} else if (var0 == 16) {
-			PlayerType.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
-		} else if (var0 == 17) {
-			PlayerType.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
-		} else if (var0 == 18) {
-			Login.loginIndex = 12;
-			Login.field1174 = 1;
-		} else if (var0 == 19) {
-			PlayerType.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
-		} else if (var0 == 20) {
-			PlayerType.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
-		} else if (var0 == 22) {
-			PlayerType.setLoginResponseString("Malformed login packet.", "Please try again.", "");
-		} else if (var0 == 23) {
-			PlayerType.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
-		} else if (var0 == 24) {
-			PlayerType.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
-		} else if (var0 == 25) {
-			PlayerType.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
-		} else if (var0 == 26) {
-			PlayerType.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
-		} else if (var0 == 27) {
-			PlayerType.setLoginResponseString("", "Service unavailable.", "");
-		} else if (var0 == 31) {
-			PlayerType.setLoginResponseString("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game.");
-		} else if (var0 == 32) {
-			PlayerType.setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system.");
-		} else if (var0 == 37) {
-			PlayerType.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
-		} else if (var0 == 38) {
-			PlayerType.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
-		} else if (var0 == 55) {
-			Login.loginIndex = 8;
-		} else {
-			if (var0 == 56) {
-				PlayerType.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", "");
-				MouseRecorder.updateGameState(11);
-				return;
-			}
-
-			if (var0 == 57) {
-				PlayerType.setLoginResponseString("The code you entered was incorrect.", "Please try again.", "");
-				MouseRecorder.updateGameState(11);
-				return;
-			}
-
-			if (var0 == 61) {
-				Login.loginIndex = 7;
-			} else {
-				PlayerType.setLoginResponseString("Unexpected server response", "Please try using a different world.", "");
-			}
-		}
-
-		MouseRecorder.updateGameState(10);
-	}
-
-	@ObfuscatedName("kb")
-	@ObfuscatedSignature(
-		signature = "(Lkl;IB)V",
-		garbageValue = "16"
-	)
-	static void method5801(Buffer var0, int var1) {
-		LoginScreenAnimation.method1832(var0.array, var1);
-		SoundSystem.method2468(var0, var1);
-	}
 }

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

@@ -3,32 +3,391 @@ 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("hy")
+@ObfuscatedName("hs")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1673038183
+		intValue = -114474261
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("data")
 	public byte[] data;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lkg;"
+		signature = "Lke;"
 	)
 	@Export("archiveDisk")
 	public ArchiveDisk archiveDisk;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "Lij;"
 	)
 	@Export("archive")
 	public Archive archive;
 
 	ArchiveDiskAction() {
 	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgw;B)I",
+		garbageValue = "2"
+	)
+	@Export("compareStrings")
+	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
+		int var3 = var0.length();
+		int var4 = var1.length();
+		int var5 = 0;
+		int var6 = 0;
+		char var7 = 0;
+		char var8 = 0;
+
+		while (var5 - var7 < var3 || var6 - var8 < var4) {
+			if (var5 - var7 >= var3) {
+				return -1;
+			}
+
+			if (var6 - var8 >= var4) {
+				return 1;
+			}
+
+			char var9;
+			if (var7 != 0) {
+				var9 = var7;
+				boolean var14 = false;
+			} else {
+				var9 = var0.charAt(var5++);
+			}
+
+			char var10;
+			if (var8 != 0) {
+				var10 = var8;
+				boolean var15 = false;
+			} else {
+				var10 = var1.charAt(var6++);
+			}
+
+			var7 = WorldMapSectionType.method296(var9);
+			var8 = WorldMapSectionType.method296(var10);
+			var9 = class80.standardizeChar(var9, var2);
+			var10 = class80.standardizeChar(var10, var2);
+			if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
+				var9 = Character.toLowerCase(var9);
+				var10 = Character.toLowerCase(var10);
+				if (var10 != var9) {
+					return ScriptEvent.lowercaseChar(var9, var2) - ScriptEvent.lowercaseChar(var10, var2);
+				}
+			}
+		}
+
+		int var16 = Math.min(var3, var4);
+
+		char var12;
+		int var17;
+		for (var17 = 0; var17 < var16; ++var17) {
+			if (var2 == Language.Language_FR) {
+				var5 = var3 - 1 - var17;
+				var6 = var4 - 1 - var17;
+			} else {
+				var6 = var17;
+				var5 = var17;
+			}
+
+			char var11 = var0.charAt(var5);
+			var12 = var1.charAt(var6);
+			if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) {
+				var11 = Character.toLowerCase(var11);
+				var12 = Character.toLowerCase(var12);
+				if (var11 != var12) {
+					return ScriptEvent.lowercaseChar(var11, var2) - ScriptEvent.lowercaseChar(var12, var2);
+				}
+			}
+		}
+
+		var17 = var3 - var4;
+		if (var17 != 0) {
+			return var17;
+		} else {
+			for (int var18 = 0; var18 < var16; ++var18) {
+				var12 = var0.charAt(var18);
+				char var13 = var1.charAt(var18);
+				if (var12 != var13) {
+					return ScriptEvent.lowercaseChar(var12, var2) - ScriptEvent.lowercaseChar(var13, var2);
+				}
+			}
+
+			return 0;
+		}
+	}
+
+	@ObfuscatedName("ay")
+	@ObfuscatedSignature(
+		signature = "(ILcj;ZB)I",
+		garbageValue = "1"
+	)
+	static int method4296(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.loadWorlds() ? 1 : 0;
+			return 1;
+		} else {
+			World var3;
+			if (var0 == ScriptOpcodes.WORLDLIST_START) {
+				var3 = WorldMapData_0.worldListStart();
+				if (var3 != null) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.activity;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.host;
+				} else {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) {
+				var3 = class1.getNextWorldListWorld();
+				if (var3 != null) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.activity;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.host;
+				} else {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+				}
+
+				return 1;
+			} else {
+				World var4;
+				int var5;
+				int var7;
+				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) {
+					var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					var4 = null;
+
+					for (var5 = 0; var5 < World.World_count; ++var5) {
+						if (var7 == Username.World_worlds[var5].id) {
+							var4 = Username.World_worlds[var5];
+							break;
+						}
+					}
+
+					if (var4 != null) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var4.activity;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var4.host;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) {
+					Interpreter.Interpreter_intStackSize -= 4;
+					var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+					boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1;
+					var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+					boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1;
+					class96.sortWorldList(var7, var10, var5, var6);
+					return 1;
+				} else if (var0 != ScriptOpcodes.GETWORLDINFO) {
+					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {
+						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+						return 1;
+					} else {
+						int var8;
+						ParamDefinition var9;
+						if (var0 == ScriptOpcodes.NC_PARAM) {
+							Interpreter.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							var9 = class162.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = SecureRandomCallable.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SecureRandomCallable.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.LC_PARAM) {
+							Interpreter.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							var9 = class162.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = WorldMapDecorationType.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapDecorationType.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.OC_PARAM) {
+							Interpreter.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							var9 = class162.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = class222.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class222.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) {
+							Interpreter.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							var9 = class162.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = GrandExchangeOfferOwnWorldComparator.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.ON_MOBILE) {
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CLIENTTYPE) {
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType & 3;
+							return 1;
+						} else if (var0 == 6520) {
+							return 1;
+						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) {
+							return 1;
+						} else if (var0 == 6522) {
+							--WorldMapDecoration.Interpreter_stringStackSize;
+							--Interpreter.Interpreter_intStackSize;
+							return 1;
+						} else if (var0 == 6523) {
+							--WorldMapDecoration.Interpreter_stringStackSize;
+							--Interpreter.Interpreter_intStackSize;
+							return 1;
+						} else if (var0 == ScriptOpcodes.BATTERYLEVEL) {
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+							return 1;
+						} else if (var0 == ScriptOpcodes.BATTERYCHARGING) {
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+							return 1;
+						} else if (var0 == ScriptOpcodes.WIFIAVAILABLE) {
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+							return 1;
+						} else {
+							return 2;
+						}
+					}
+				} else {
+					var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (var7 >= 0 && var7 < World.World_count) {
+						var4 = Username.World_worlds[var7];
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var4.activity;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var4.host;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("ix")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		garbageValue = "-128903403"
+	)
+	@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;
+			}
+
+		}
+	}
+
+	@ObfuscatedName("kf")
+	@ObfuscatedSignature(
+		signature = "(Lhi;I)V",
+		garbageValue = "774063316"
+	)
+	static final void method4297(Widget var0) {
+		int var1 = var0.contentType;
+		if (var1 == 324) {
+			if (Client.field818 == -1) {
+				Client.field818 = var0.spriteId2;
+				Client.field896 = var0.spriteId;
+			}
+
+			if (Client.playerAppearance.isFemale) {
+				var0.spriteId2 = Client.field818;
+			} else {
+				var0.spriteId2 = Client.field896;
+			}
+
+		} else if (var1 == 325) {
+			if (Client.field818 == -1) {
+				Client.field818 = var0.spriteId2;
+				Client.field896 = var0.spriteId;
+			}
+
+			if (Client.playerAppearance.isFemale) {
+				var0.spriteId2 = Client.field896;
+			} else {
+				var0.spriteId2 = Client.field818;
+			}
+
+		} 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;
+		}
+	}
 }

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

@@ -4,34 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ih")
+@ObfuscatedName("ig")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Ljv;"
+		signature = "Ljb;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
 	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ljv;"
+		signature = "Ljb;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
 	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1320379029
+		intValue = -2025054069
 	)
-	static int field3127;
+	static int field3132;
-	@ObfuscatedName("u")
+	@ObfuscatedName("v")
 	@Export("ArchiveDiskActionHandler_lock")
 	static Object ArchiveDiskActionHandler_lock;
+	@ObfuscatedName("l")
+	@Export("ArchiveDiskActionHandler_thread")
+	static Thread ArchiveDiskActionHandler_thread;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1867272823
+	)
+	static int field3133;
+	@ObfuscatedName("dr")
+	@ObfuscatedGetter(
+		longValue = -4581696908763214333L
+	)
+	static long field3130;
+	@ObfuscatedName("fk")
+	@ObfuscatedSignature(
+		signature = "Lks;"
+	)
+	@Export("fontPlain12")
+	static Font fontPlain12;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3127 = 0;
+		field3132 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -60,50 +79,29 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3127 <= 1) {
+						if (field3132 <= 1) {
-							field3127 = 0;
+							field3132 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3127 = 600;
+						field3132 = 600;
 					}
 				} else {
-					long var8 = 99L;
+					ClanChat.method5367(100L);
-
-					try {
-						Thread.sleep(var8);
-					} catch (InterruptedException var15) {
-					}
-
-					try {
-						Thread.sleep(1L);
-					} catch (InterruptedException var14) {
-					}
-
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3127 <= 1) {
+						if (field3132 <= 1) {
-							field3127 = 0;
+							field3132 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3127;
+						--field3132;
 					}
 				}
 			}
-		} catch (Exception var17) {
+		} catch (Exception var13) {
-			class32.RunException_sendStackTrace((String)null, var17);
+			User.RunException_sendStackTrace((String)null, var13);
 		}
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZZB)V",
-		garbageValue = "10"
-	)
-	@Export("openURL")
-	public static void openURL(String var0, boolean var1, boolean var2) {
-		WorldMapID.method568(var0, var1, "openjs", var2);
-	}
 }

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

@@ -3,43 +3,44 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bs")
+@ObfuscatedName("bh")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
 	@ObfuscatedName("c")
-	@Export("Tiles_saturation")
+	@ObfuscatedGetter(
-	static int[] Tiles_saturation;
+		intValue = 1109035575
-	@ObfuscatedName("bz")
-	@ObfuscatedSignature(
-		signature = "[Llf;"
 	)
-	@Export("worldSelectBackSprites")
+	@Export("gameCyclesToDo")
-	static Sprite[] worldSelectBackSprites;
+	static int gameCyclesToDo;
-	@ObfuscatedName("gi")
+	@ObfuscatedName("x")
-	@Export("regionMapArchives")
-	static byte[][] regionMapArchives;
-	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "[Lmz;"
+	)
+	@Export("JagexCache_idxFiles")
+	public static BufferedFile[] JagexCache_idxFiles;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "Lij;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1526719037
+		intValue = -1458094845
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 966789861
+		intValue = 1936388269
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		signature = "(Lie;Ljava/lang/String;)V"
+		signature = "(Lij;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -47,17 +48,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1969120013"
+		garbageValue = "2053388584"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4244(var1) || this.archive.method4243(var1)) {
+			if (!this.archive.method4436(var1) || this.archive.method4417(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -65,58 +66,822 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(II)Z",
-		garbageValue = "-238840199"
+		garbageValue = "145350821"
 	)
-	public static int method1173(int var0) {
+	public static boolean method1239(int var0) {
-		return class32.method578(ViewportMouse.ViewportMouse_entityTags[var0]);
+		return var0 == WorldMapDecorationType.field2723.id;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lbo;Lbo;IZIZB)I",
+		signature = "(III)I",
-		garbageValue = "7"
+		garbageValue = "-1915313873"
 	)
-	static int method1174(World var0, World var1, int var2, boolean var3, int var4, boolean var5) {
+	static int method1237(int var0, int var1) {
-		int var6 = UserComparator7.compareWorlds(var0, var1, var2, var3);
+		if (var0 == -2) {
-		if (var6 != 0) {
+			return 12345678;
-			return var3 ? -var6 : var6;
+		} else if (var0 == -1) {
-		} else if (var4 == -1) {
+			if (var1 < 0) {
-			return 0;
+				var1 = 0;
+			} else if (var1 > 127) {
+				var1 = 127;
+			}
+
+			var1 = 127 - var1;
+			return var1;
 		} else {
-			int var7 = UserComparator7.compareWorlds(var0, var1, var4, var5);
+			var1 = (var0 & 127) * var1 / 128;
-			return var5 ? -var7 : var7;
+			if (var1 < 2) {
+				var1 = 2;
+			} else if (var1 > 126) {
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1;
+		}
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(Lhq;I)V",
+		garbageValue = "1291572583"
+	)
+	public static void method1235(AbstractArchive var0) {
+		FloorOverlayDefinition.FloorOverlayDefinition_archive = var0;
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(Lkf;B)V",
+		garbageValue = "49"
+	)
+	@Export("updatePlayer")
+	static final void updatePlayer(PacketBuffer var0) {
+		var0.importIndex();
+		int var1 = Client.localPlayerIndex;
+		Player var2 = class215.localPlayer = Client.players[var1] = new Player();
+		var2.index = var1;
+		int var3 = var0.readBits(30);
+		byte var4 = (byte)(var3 >> 28);
+		int var5 = var3 >> 14 & 16383;
+		int var6 = var3 & 16383;
+		var2.pathX[0] = var5 - UserComparator8.baseX * 64;
+		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6);
+		var2.pathY[0] = var6 - HealthBar.baseY * 64;
+		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
+		Player.Scene_plane = var2.plane = var4;
+		if (Players.field1229[var1] != null) {
+			var2.read(Players.field1229[var1]);
+		}
+
+		Players.Players_count = 0;
+		Players.Players_indices[++Players.Players_count - 1] = var1;
+		Players.field1227[var1] = 0;
+		Players.Players_emptyIdxCount = 0;
+
+		for (int var7 = 1; var7 < 2048; ++var7) {
+			if (var1 != var7) {
+				int var8 = var0.readBits(18);
+				int var9 = var8 >> 16;
+				int var10 = var8 >> 8 & 597;
+				int var11 = var8 & 597;
+				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
+				Players.Players_orientations[var7] = 0;
+				Players.Players_targetIndices[var7] = -1;
+				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
+				Players.field1227[var7] = 0;
+			}
+		}
+
+		var0.exportIndex();
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(IIII)I",
+		garbageValue = "-561019342"
+	)
+	static int method1230(int var0, int var1, int var2) {
+		if (var2 > 179) {
+			var1 /= 2;
+		}
+
+		if (var2 > 192) {
+			var1 /= 2;
+		}
+
+		if (var2 > 217) {
+			var1 /= 2;
+		}
+
+		if (var2 > 243) {
+			var1 /= 2;
+		}
+
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
+		return var3;
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		signature = "(IIB)Lhi;",
+		garbageValue = "-102"
+	)
+	@Export("getWidgetChild")
+	public static Widget getWidgetChild(int var0, int var1) {
+		Widget var2 = PacketBufferNode.getWidget(var0);
+		if (var1 == -1) {
+			return var2;
+		} else {
+			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
 		}
 	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "([BIIB)Ljava/lang/String;",
+		signature = "(Lkc;II)Ljava/lang/String;",
-		garbageValue = "-113"
+		garbageValue = "1190041961"
 	)
-	@Export("decodeStringCp1252")
+	static String method1234(Buffer var0, int var1) {
-	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
+		try {
-		char[] var3 = new char[var2];
+			int var2 = var0.readUShortSmart();
-		int var4 = 0;
+			if (var2 > var1) {
+				var2 = var1;
+			}
 
-		for (int var5 = 0; var5 < var2; ++var5) {
+			byte[] var3 = new byte[var2];
-			int var6 = var0[var5 + var1] & 255;
+			var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2);
-			if (var6 != 0) {
+			String var4 = class160.decodeStringCp1252(var3, 0, var2);
-				if (var6 >= 128 && var6 < 160) {
+			return var4;
-					char var7 = class287.cp1252AsciiExtension[var6 - 128];
+		} catch (Exception var6) {
-					if (var7 == 0) {
+			return "Cabbage";
-						var7 = '?';
+		}
-					}
+	}
 
-					var6 = var7;
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;II)V",
+		garbageValue = "2071952148"
+	)
+	static final void method1242(String var0, int var1) {
+		PacketBufferNode var2 = SoundSystem.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher);
+		var2.packetBuffer.writeByte(UserComparator6.stringCp1252NullTerminatedByteSize(var0) + 1);
+		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
+		var2.packetBuffer.method5634(var1);
+		Client.packetWriter.addNode(var2);
+	}
+
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		signature = "([BI)[B",
+		garbageValue = "-79197837"
+	)
+	@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.field3128 != 0 && var3 > AbstractArchive.field3128) {
+			throw new RuntimeException();
+		} else if (var2 == 0) {
+			byte[] var4 = new byte[var3];
+			var1.readBytes(var4, 0, var3);
+			return var4;
+		} else {
+			int var6 = var1.readInt();
+			if (var6 < 0 || AbstractArchive.field3128 != 0 && var6 > AbstractArchive.field3128) {
+				throw new RuntimeException();
+			} else {
+				byte[] var5 = new byte[var6];
+				if (var2 == 1) {
+					BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9);
+				} else {
+					AbstractArchive.gzipDecompressor.decompress(var1, var5);
 				}
 
-				var3[var4++] = (char)var6;
+				return var5;
+			}
+		}
+	}
+
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		signature = "(ILcj;ZI)I",
+		garbageValue = "1460957872"
+	)
+	static int method1245(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.GETWINDOWMODE) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.getWindowedMode();
+			return 1;
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.SETWINDOWMODE) {
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (var3 == 1 || var3 == 2) {
+					FontName.setWindowedMode(var3);
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptEvent.clientPreferences.windowMode;
+				return 1;
+			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) {
+				if (var0 == 5310) {
+					--Interpreter.Interpreter_intStackSize;
+					return 1;
+				} else {
+					return 2;
+				}
+			} else {
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (var3 == 1 || var3 == 2) {
+					ScriptEvent.clientPreferences.windowMode = var3;
+					HitSplatDefinition.savePreferences();
+				}
+
+				return 1;
+			}
+		}
+	}
+
+	@ObfuscatedName("jg")
+	@ObfuscatedSignature(
+		signature = "(IIIIIB)V",
+		garbageValue = "-34"
+	)
+	@Export("drawScrollBar")
+	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+		NetSocket.scrollBarSprites[0].drawAt(var0, var1);
+		NetSocket.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field895);
+		int var5 = var3 * (var3 - 32) / var4;
+		if (var5 < 8) {
+			var5 = 8;
+		}
+
+		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field661);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field790);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field790);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field790);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field790);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field683);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field683);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field683);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field683);
+	}
+
+	@ObfuscatedName("jf")
+	@ObfuscatedSignature(
+		signature = "([Lhi;IIIIIIII)V",
+		garbageValue = "-954572124"
+	)
+	@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 || class195.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
+				if (var9.isIf3) {
+					if (WorldMapManager.isComponentHidden(var9)) {
+						continue;
+					}
+				} else if (var9.type == 0 && var9 != ChatChannel.mousedOverWidgetIf1 && WorldMapManager.isComponentHidden(var9)) {
+					continue;
+				}
+
+				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.field695 = true;
+					Client.field846 = var10;
+					Client.field814 = var11;
+				}
+
+				boolean var32 = false;
+				if (var9.field2606) {
+					switch(Client.field828) {
+					case 0:
+						var32 = true;
+					case 1:
+					default:
+						break;
+					case 2:
+						if (Client.field794 == var9.id >>> 16) {
+							var32 = true;
+						}
+						break;
+					case 3:
+						if (var9.id == Client.field794) {
+							var32 = true;
+						}
+					}
+				}
+
+				if (var32 || !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 (FloorDecoration.widgetDragDuration == 0) {
+									Client.clickedWidget = null;
+									Client.clickedWidgetParent = null;
+								}
+
+								if (!Client.isMenuOpen) {
+									ClientPacket.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 var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15;
+					if (var9.contentType == 1337) {
+						if (!Client.isLoading && !Client.isMenuOpen && var33) {
+							GrandExchangeOfferNameComparator.addSceneMenuOptions(var17, var18, var12, var13);
+						}
+					} else if (var9.contentType == 1338) {
+						WorldMapIcon_1.checkIfMinimapClicked(var9, var10, var11);
+					} else {
+						if (var9.contentType == 1400) {
+							Login.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height);
+						}
+
+						if (!Client.isMenuOpen && var33) {
+							if (var9.contentType == 1400) {
+								Login.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18);
+							} else {
+								class80.method2197(var9, var17 - var10, var18 - var11);
+							}
+						}
+
+						boolean var21;
+						int var23;
+						if (var32) {
+							for (int var20 = 0; var20 < var9.field2623.length; ++var20) {
+								var21 = false;
+								boolean var22 = false;
+								if (!var21 && var9.field2623[var20] != null) {
+									for (var23 = 0; var23 < var9.field2623[var20].length; ++var23) {
+										boolean var24 = false;
+										if (var9.field2627 != null) {
+											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2623[var20][var23]];
+										}
+
+										if (Frames.method3400(var9.field2623[var20][var23]) || var24) {
+											var21 = true;
+											if (var9.field2627 != null && var9.field2627[var20] > Client.cycle) {
+												break;
+											}
+
+											byte var25 = var9.field2624[var20][var23];
+											if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
+												var22 = true;
+												break;
+											}
+										}
+									}
+								}
+
+								if (var22) {
+									if (var20 < 10) {
+										class287.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
+									} else if (var20 == 10) {
+										InterfaceParent.Widget_runOnTargetLeave();
+										class51.selectSpell(var9.id, var9.childIndex, UserComparator5.method3551(class195.getWidgetClickMask(var9)), var9.itemId);
+										Client.selectedSpellActionName = SoundCache.method2666(var9);
+										if (Client.selectedSpellActionName == null) {
+											Client.selectedSpellActionName = "null";
+										}
+
+										Client.selectedSpellName = var9.dataText + AbstractArchive.colorStartTag(16777215);
+									}
+
+									var23 = var9.field2628[var20];
+									if (var9.field2627 == null) {
+										var9.field2627 = new int[var9.field2623.length];
+									}
+
+									if (var9.field2626 == null) {
+										var9.field2626 = new int[var9.field2623.length];
+									}
+
+									if (var23 != 0) {
+										if (var9.field2627[var20] == 0) {
+											var9.field2627[var20] = var23 + Client.cycle + var9.field2626[var20];
+										} else {
+											var9.field2627[var20] = var23 + Client.cycle;
+										}
+									} else {
+										var9.field2627[var20] = Integer.MAX_VALUE;
+									}
+								}
+
+								if (!var21 && var9.field2627 != null) {
+									var9.field2627[var20] = 0;
+								}
+							}
+						}
+
+						if (var9.isIf3) {
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								var33 = true;
+							} else {
+								var33 = false;
+							}
+
+							boolean var34 = false;
+							if ((MouseHandler.MouseHandler_currentButton == 1 || !WorldMapLabelSize.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) {
+								var34 = true;
+							}
+
+							var21 = false;
+							if ((MouseHandler.MouseHandler_lastButton == 1 || !WorldMapLabelSize.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) {
+								class4.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
+							}
+
+							if (var9.contentType == 1400) {
+								Login.worldMap.method6429(var17, var18, var33 & var34, var33 & var21);
+							}
+
+							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && TextureProvider.method2931(class195.getWidgetClickMask(var9))) {
+								Client.draggedOnWidget = var9;
+							}
+
+							if (var9 == Client.clickedWidgetParent) {
+								Client.field809 = true;
+								Client.field748 = var10;
+								Client.field751 = var11;
+							}
+
+							if (var9.hasListener) {
+								ScriptEvent var29;
+								if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
+									var29 = new ScriptEvent();
+									var29.isMouseInputEvent = true;
+									var29.widget = var9;
+									var29.mouseY = Client.mouseWheelRotation;
+									var29.args = var9.onScroll;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (Client.clickedWidget != null || GrandExchangeOffer.dragInventoryWidget != null || Client.isMenuOpen) {
+									var21 = false;
+									var34 = false;
+									var33 = false;
+								}
+
+								if (!var9.isClicked && var21) {
+									var9.isClicked = true;
+									if (var9.onClick != null) {
+										var29 = new ScriptEvent();
+										var29.isMouseInputEvent = true;
+										var29.widget = var9;
+										var29.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
+										var29.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
+										var29.args = var9.onClick;
+										Client.scriptEvents.addFirst(var29);
+									}
+								}
+
+								if (var9.isClicked && var34 && var9.onClickRepeat != null) {
+									var29 = new ScriptEvent();
+									var29.isMouseInputEvent = true;
+									var29.widget = var9;
+									var29.mouseX = MouseHandler.MouseHandler_x - var10;
+									var29.mouseY = MouseHandler.MouseHandler_y - var11;
+									var29.args = var9.onClickRepeat;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (var9.isClicked && !var34) {
+									var9.isClicked = false;
+									if (var9.onRelease != null) {
+										var29 = new ScriptEvent();
+										var29.isMouseInputEvent = true;
+										var29.widget = var9;
+										var29.mouseX = MouseHandler.MouseHandler_x - var10;
+										var29.mouseY = MouseHandler.MouseHandler_y - var11;
+										var29.args = var9.onRelease;
+										Client.field832.addFirst(var29);
+									}
+								}
+
+								if (var34 && var9.onHold != null) {
+									var29 = new ScriptEvent();
+									var29.isMouseInputEvent = true;
+									var29.widget = var9;
+									var29.mouseX = MouseHandler.MouseHandler_x - var10;
+									var29.mouseY = MouseHandler.MouseHandler_y - var11;
+									var29.args = var9.onHold;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (!var9.containsMouse && var33) {
+									var9.containsMouse = true;
+									if (var9.onMouseOver != null) {
+										var29 = new ScriptEvent();
+										var29.isMouseInputEvent = true;
+										var29.widget = var9;
+										var29.mouseX = MouseHandler.MouseHandler_x - var10;
+										var29.mouseY = MouseHandler.MouseHandler_y - var11;
+										var29.args = var9.onMouseOver;
+										Client.scriptEvents.addFirst(var29);
+									}
+								}
+
+								if (var9.containsMouse && var33 && var9.onMouseRepeat != null) {
+									var29 = new ScriptEvent();
+									var29.isMouseInputEvent = true;
+									var29.widget = var9;
+									var29.mouseX = MouseHandler.MouseHandler_x - var10;
+									var29.mouseY = MouseHandler.MouseHandler_y - var11;
+									var29.args = var9.onMouseRepeat;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (var9.containsMouse && !var33) {
+									var9.containsMouse = false;
+									if (var9.onMouseLeave != null) {
+										var29 = new ScriptEvent();
+										var29.isMouseInputEvent = true;
+										var29.widget = var9;
+										var29.mouseX = MouseHandler.MouseHandler_x - var10;
+										var29.mouseY = MouseHandler.MouseHandler_y - var11;
+										var29.args = var9.onMouseLeave;
+										Client.field832.addFirst(var29);
+									}
+								}
+
+								if (var9.onTimer != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.onTimer;
+									Client.field813.addFirst(var29);
+								}
+
+								ScriptEvent var30;
+								int var35;
+								int var36;
+								if (var9.onVarTransmit != null && Client.field679 > var9.field2644) {
+									if (var9.varTransmitTriggers != null && Client.field679 - var9.field2644 <= 32) {
+										label886:
+										for (var35 = var9.field2644; var35 < Client.field679; ++var35) {
+											var23 = Client.field817[var35 & 31];
+
+											for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
+												if (var23 == var9.varTransmitTriggers[var36]) {
+													var30 = new ScriptEvent();
+													var30.widget = var9;
+													var30.args = var9.onVarTransmit;
+													Client.scriptEvents.addFirst(var30);
+													break label886;
+												}
+											}
+										}
+									} else {
+										var29 = new ScriptEvent();
+										var29.widget = var9;
+										var29.args = var9.onVarTransmit;
+										Client.scriptEvents.addFirst(var29);
+									}
+
+									var9.field2644 = Client.field679;
+								}
+
+								if (var9.onInvTransmit != null && Client.field820 > var9.field2567) {
+									if (var9.invTransmitTriggers != null && Client.field820 - var9.field2567 <= 32) {
+										label862:
+										for (var35 = var9.field2567; var35 < Client.field820; ++var35) {
+											var23 = Client.field816[var35 & 31];
+
+											for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
+												if (var23 == var9.invTransmitTriggers[var36]) {
+													var30 = new ScriptEvent();
+													var30.widget = var9;
+													var30.args = var9.onInvTransmit;
+													Client.scriptEvents.addFirst(var30);
+													break label862;
+												}
+											}
+										}
+									} else {
+										var29 = new ScriptEvent();
+										var29.widget = var9;
+										var29.args = var9.onInvTransmit;
+										Client.scriptEvents.addFirst(var29);
+									}
+
+									var9.field2567 = Client.field820;
+								}
+
+								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2684) {
+									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2684 <= 32) {
+										label838:
+										for (var35 = var9.field2684; var35 < Client.changedSkillsCount; ++var35) {
+											var23 = Client.changedSkills[var35 & 31];
+
+											for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
+												if (var23 == var9.statTransmitTriggers[var36]) {
+													var30 = new ScriptEvent();
+													var30.widget = var9;
+													var30.args = var9.onStatTransmit;
+													Client.scriptEvents.addFirst(var30);
+													break label838;
+												}
+											}
+										}
+									} else {
+										var29 = new ScriptEvent();
+										var29.widget = var9;
+										var29.args = var9.onStatTransmit;
+										Client.scriptEvents.addFirst(var29);
+									}
+
+									var9.field2684 = Client.changedSkillsCount;
+								}
+
+								if (Client.chatCycle > var9.field2681 && var9.onChatTransmit != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.onChatTransmit;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (Client.field824 > var9.field2681 && var9.onFriendTransmit != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.onFriendTransmit;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (Client.field825 > var9.field2681 && var9.onClanTransmit != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.onClanTransmit;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (Client.field826 > var9.field2681 && var9.onStockTransmit != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.onStockTransmit;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (Client.field652 > var9.field2681 && var9.field2665 != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.field2665;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								if (Client.field834 > var9.field2681 && var9.onMiscTransmit != null) {
+									var29 = new ScriptEvent();
+									var29.widget = var9;
+									var29.args = var9.onMiscTransmit;
+									Client.scriptEvents.addFirst(var29);
+								}
+
+								var9.field2681 = Client.cycleCntr;
+								if (var9.onKey != null) {
+									for (var35 = 0; var35 < Client.field866; ++var35) {
+										ScriptEvent var31 = new ScriptEvent();
+										var31.widget = var9;
+										var31.keyTyped = Client.field854[var35];
+										var31.keyPressed = Client.field853[var35];
+										var31.args = var9.onKey;
+										Client.scriptEvents.addFirst(var31);
+									}
+								}
+							}
+						}
+
+						if (!var9.isIf3) {
+							if (Client.clickedWidget != null || GrandExchangeOffer.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) {
+									ChatChannel.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+								} else {
+									ChatChannel.mousedOverWidgetIf1 = var9;
+								}
+							}
+
+							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								GrandExchangeEvents.field39 = var9;
+							}
+
+							if (var9.scrollHeight > var9.height) {
+								GrandExchangeOfferOwnWorldComparator.method1389(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 var27 = (InterfaceParent)Client.interfaceParents.get((long)var9.id);
+							if (var27 != null) {
+								if (var27.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
+									for (ScriptEvent var28 = (ScriptEvent)Client.scriptEvents.last(); var28 != null; var28 = (ScriptEvent)Client.scriptEvents.previous()) {
+										if (var28.isMouseInputEvent) {
+											var28.remove();
+											var28.widget.containsMouse = false;
+										}
+									}
+
+									if (FloorDecoration.widgetDragDuration == 0) {
+										Client.clickedWidget = null;
+										Client.clickedWidgetParent = null;
+									}
+
+									if (!Client.isMenuOpen) {
+										ClientPacket.addCancelMenuEntry();
+									}
+								}
+
+								ServerBuild.updateRootInterface(var27.group, var12, var13, var14, var15, var10, var11);
+							}
+						}
+					}
+				}
 			}
 		}
 
-		return new String(var3, 0, var4);
 	}
 }

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

@@ -1,59 +1,51 @@
-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("cn")
+@ObfuscatedName("cr")
 @Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lcn;"
+		signature = "Lcr;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lcn;"
+		signature = "Lcr;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lcn;"
+		signature = "Lcr;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lcn;"
+		signature = "Lcr;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("dw")
+	@ObfuscatedName("c")
+	@Export("SpriteBuffer_spriteHeights")
+	public static int[] SpriteBuffer_spriteHeights;
+	@ObfuscatedName("h")
+	public static boolean field1151;
+	@ObfuscatedName("fp")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "Lfw;"
 	)
-	@Export("archive9")
+	@Export("socketTask")
-	static Archive archive9;
+	static Task socketTask;
-	@ObfuscatedName("gr")
+	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "Llf;"
-	)
-	@Export("compass")
-	static Sprite compass;
-	@ObfuscatedName("lc")
 	@ObfuscatedGetter(
-		intValue = 629841565
+		intValue = -871271379
-	)
-	@Export("selectedSpellWidget")
-	static int selectedSpellWidget;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -1814915457
 	)
 	@Export("id")
 	final int id;
@@ -62,107 +54,124 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(S)I",
+		signature = "(I)I",
-		garbageValue = "221"
+		garbageValue = "-1993081102"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Ljava/security/SecureRandom;",
+		signature = "(Lhq;B)V",
-		garbageValue = "639446581"
+		garbageValue = "17"
 	)
-	static SecureRandom method2081() {
+	public static void method2221(AbstractArchive var0) {
-		SecureRandom var0 = new SecureRandom();
+		VarbitDefinition.VarbitDefinition_archive = var0;
-		var0.nextInt();
-		return var0;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkf;I)V",
+		signature = "(Lhq;Lhq;ZIS)V",
-		garbageValue = "-379415067"
+		garbageValue = "-32666"
 	)
-	@Export("updatePlayer")
+	static void method2218(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-	static final void updatePlayer(PacketBuffer var0) {
+		if (Login.field1188) {
-		var0.importIndex();
+			if (var3 == 4) {
-		int var1 = Client.localPlayerIndex;
+				Login.loginIndex = 4;
-		Player var2 = class223.localPlayer = Client.players[var1] = new Player();
-		var2.index = var1;
-		int var3 = var0.readBits(30);
-		byte var4 = (byte)(var3 >> 28);
-		int var5 = var3 >> 14 & 16383;
-		int var6 = var3 & 16383;
-		var2.pathX[0] = var5 - class223.baseX * 64;
-		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6);
-		var2.pathY[0] = var6 - class286.baseY * 64;
-		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
-		WorldMapRectangle.plane = var2.plane = var4;
-		if (Players.field1236[var1] != null) {
-			var2.read(Players.field1236[var1]);
-		}
-
-		Players.Players_count = 0;
-		Players.Players_indices[++Players.Players_count - 1] = var1;
-		Players.field1244[var1] = 0;
-		Players.Players_emptyIdxCount = 0;
-
-		for (int var7 = 1; var7 < 2048; ++var7) {
-			if (var1 != var7) {
-				int var8 = var0.readBits(18);
-				int var9 = var8 >> 16;
-				int var10 = var8 >> 8 & 597;
-				int var11 = var8 & 597;
-				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
-				Players.Players_orientations[var7] = 0;
-				Players.Players_targetIndices[var7] = -1;
-				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
-				Players.field1244[var7] = 0;
-			}
-		}
-
-		var0.exportIndex();
-	}
-
-	@ObfuscatedName("ed")
-	@ObfuscatedSignature(
-		signature = "(IZZZI)Lie;",
-		garbageValue = "1568056482"
-	)
-	@Export("newArchive")
-	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
-		ArchiveDisk var4 = null;
-		if (JagexCache.JagexCache_dat2File != null) {
-			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class189.JagexCache_idxFiles[var0], 1000000);
-		}
-
-		return new Archive(var4, WorldMapData_0.masterDisk, var0, var1, var2, var3);
-	}
-
-	@ObfuscatedName("hj")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
-		garbageValue = "844579626"
-	)
-	@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;
 			}
 
+		} else {
+			Login.loginIndex = var3;
+			Rasterizer2D.Rasterizer2D_clear();
+			byte[] var4 = var0.takeFileByNames("title.jpg", "");
+			Login.leftTitleSprite = WorldMapSection1.convertJpgToSprite(var4);
+			FontName.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally();
+			if ((Client.worldProperties & 536870912) != 0) {
+				Tiles.logoSprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
+			} else if ((Client.worldProperties & 1073741824) != 0) {
+				Tiles.logoSprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", "");
+			} else {
+				Tiles.logoSprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
+			}
+
+			NPC.titleboxSprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
+			UserComparator9.titlebuttonSprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
+			class208.runesSprite = PlayerAppearance.method4160(var1, "runes", "");
+			Decimator.title_muteSprite = PlayerAppearance.method4160(var1, "title_mute", "");
+			UserComparator8.options_buttons_0Sprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
+			class51.field412 = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
+			Login.options_buttons_2Sprite = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
+			class4.field23 = ClientPacket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
+			Login.field1174 = UserComparator8.options_buttons_0Sprite.subWidth;
+			Language.field2328 = UserComparator8.options_buttons_0Sprite.subHeight;
+			Login.loginScreenRunesAnimation = new LoginScreenAnimation(class208.runesSprite);
+			if (var2) {
+				Login.Login_username = "";
+				Login.Login_password = "";
+			}
+
+			Huffman.field2491 = 0;
+			class268.otp = "";
+			Login.field1177 = true;
+			Login.worldSelectOpen = false;
+			if (!ScriptEvent.clientPreferences.titleMusicDisabled) {
+				Archive var5 = class216.archive6;
+				int var6 = var5.getGroupId("scape main");
+				int var7 = var5.getFileId(var6, "");
+				WorldMapIcon_0.method253(2, var5, var6, var7, 255, false);
+			} else {
+				class80.method2194(2);
+			}
+
+			UrlRequester.method3428(false);
+			Login.field1188 = true;
+			Login.xPadding = (class286.canvasWidth - 765) / 2;
+			Login.loginBoxX = Login.xPadding + 202;
+			class192.loginBoxCenter = Login.loginBoxX + 180;
+			Login.leftTitleSprite.drawAt(Login.xPadding, 0);
+			FontName.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+			Tiles.logoSprite.drawAt(Login.xPadding + 382 - Tiles.logoSprite.subWidth / 2, 18);
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(II)I",
+		garbageValue = "2026213000"
+	)
+	@Export("Messages_getHistorySize")
+	static int Messages_getHistorySize(int var0) {
+		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0);
+		return var1 == null ? 0 : var1.size();
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1182575987"
+	)
+	static void method2215() {
+		if (class43.loadWorlds()) {
+			Login.worldSelectOpen = true;
+			Login.worldSelectPage = 0;
+			Login.worldSelectPagesCount = 0;
+		}
+
+	}
+
+	@ObfuscatedName("jj")
+	@ObfuscatedSignature(
+		signature = "(III)V",
+		garbageValue = "2104552058"
+	)
+	@Export("runIntfCloseListeners")
+	static final void runIntfCloseListeners(int var0, int var1) {
+		if (TextureProvider.loadInterface(var0)) {
+			DirectByteArrayCopier.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1);
 		}
 	}
 }

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("ds")
+@ObfuscatedName("dz")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
-	static float[][] field1454;
+	static float[][] field1460;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
-	static float field1456;
+	static float field1458;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("pairs")
 	int[] pairs;
+	@ObfuscatedName("n")
+	int[][][] field1457;
+	@ObfuscatedName("q")
+	int[][][] field1459;
 	@ObfuscatedName("v")
-	int[][][] field1458;
+	int[] field1455;
-	@ObfuscatedName("u")
-	int[][][] field1452;
-	@ObfuscatedName("r")
-	int[] field1453;
 
 	static {
-		field1454 = new float[2][8];
+		field1460 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field1458 = new int[2][2][4];
+		this.field1457 = new int[2][2][4];
-		this.field1452 = new int[2][2][4];
+		this.field1459 = new int[2][2][4];
-		this.field1453 = new int[2];
+		this.field1455 = new int[2];
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
-	float method2674(int var1, int var2, float var3) {
+	float method2857(int var1, int var2, float var3) {
-		float var4 = (float)this.field1452[var1][0][var2] + var3 * (float)(this.field1452[var1][1][var2] - this.field1452[var1][0][var2]);
+		float var4 = (float)this.field1459[var1][0][var2] + var3 * (float)(this.field1459[var1][1][var2] - this.field1459[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
-	float method2676(int var1, int var2, float var3) {
+	float method2854(int var1, int var2, float var3) {
-		float var4 = (float)this.field1458[var1][0][var2] + var3 * (float)(this.field1458[var1][1][var2] - this.field1458[var1][0][var2]);
+		float var4 = (float)this.field1457[var1][0][var2] + var3 * (float)(this.field1457[var1][1][var2] - this.field1457[var1][0][var2]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1453[0] + (float)(this.field1453[1] - this.field1453[0]) * var2;
+			var3 = (float)this.field1455[0] + (float)(this.field1455[1] - this.field1455[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1456 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			field1458 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1456 * 65536.0F);
+			forwardMultiplier = (int)(field1458 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method2674(var1, 0, var2);
+			var3 = this.method2857(var1, 0, var2);
-			field1454[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2676(var1, 0, var2));
+			field1460[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2854(var1, 0, var2));
-			field1454[var1][1] = var3 * var3;
+			field1460[var1][1] = var3 * var3;
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method2674(var1, var4, var2);
+				var3 = this.method2857(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2676(var1, var4, var2));
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2854(var1, var4, var2));
 				float var6 = var3 * var3;
-				field1454[var1][var4 * 2 + 1] = field1454[var1][var4 * 2 - 1] * var6;
+				field1460[var1][var4 * 2 + 1] = field1460[var1][var4 * 2 - 1] * var6;
-				field1454[var1][var4 * 2] = field1454[var1][var4 * 2 - 1] * var5 + field1454[var1][var4 * 2 - 2] * var6;
+				field1460[var1][var4 * 2] = field1460[var1][var4 * 2 - 1] * var5 + field1460[var1][var4 * 2 - 2] * var6;
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field1454[var1];
+					var10000 = field1460[var1];
-					var10000[var7] += field1454[var1][var7 - 1] * var5 + field1454[var1][var7 - 2] * var6;
+					var10000[var7] += field1460[var1][var7 - 1] * var5 + field1460[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field1454[var1];
+				var10000 = field1460[var1];
-				var10000[1] += field1454[var1][0] * var5 + var6;
+				var10000[1] += field1460[var1][0] * var5 + var6;
-				var10000 = field1454[var1];
+				var10000 = field1460[var1];
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field1454[0];
+					var10000 = field1460[0];
-					var10000[var4] *= field1456;
+					var10000[var4] *= field1458;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field1454[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1460[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2;
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkl;Ldm;)V"
+		signature = "(Lkc;Ldd;)V"
 	)
-	final void method2678(Buffer var1, SoundEnvelope var2) {
+	final void method2852(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field1453[0] = var1.readUnsignedShort();
+			this.field1455[0] = var1.readUnsignedShort();
-			this.field1453[1] = var1.readUnsignedShort();
+			this.field1455[1] = var1.readUnsignedShort();
 			int var4 = var1.readUnsignedByte();
 
 			int var5;
 			int var6;
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
-					this.field1458[var5][0][var6] = var1.readUnsignedShort();
+					this.field1457[var5][0][var6] = var1.readUnsignedShort();
-					this.field1452[var5][0][var6] = var1.readUnsignedShort();
+					this.field1459[var5][0][var6] = var1.readUnsignedShort();
 				}
 			}
 
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
 					if ((var4 & 1 << var5 * 4 << var6) != 0) {
-						this.field1458[var5][1][var6] = var1.readUnsignedShort();
+						this.field1457[var5][1][var6] = var1.readUnsignedShort();
-						this.field1452[var5][1][var6] = var1.readUnsignedShort();
+						this.field1459[var5][1][var6] = var1.readUnsignedShort();
 					} else {
-						this.field1458[var5][1][var6] = this.field1458[var5][0][var6];
+						this.field1457[var5][1][var6] = this.field1457[var5][0][var6];
-						this.field1452[var5][1][var6] = this.field1452[var5][0][var6];
+						this.field1459[var5][1][var6] = this.field1459[var5][0][var6];
 					}
 				}
 			}
 
-			if (var4 != 0 || this.field1453[1] != this.field1453[0]) {
+			if (var4 != 0 || this.field1455[1] != this.field1455[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var7 = this.field1453;
+			int[] var7 = this.field1455;
-			this.field1453[1] = 0;
+			this.field1455[1] = 0;
 			var7[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@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("km")
+@ObfuscatedName("kd")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lkj;"
+		signature = "Lky;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@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.field3713 = 0;
+			BZip2Decompressor_state.field3718 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkj;)V"
+		signature = "(Lky;)V"
 	)
-	static void method5705(BZip2State var0) {
+	static void method5897(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = DirectByteArrayCopier.BZip2Decompressor_block;
+		int[] var6 = class162.BZip2Decompressor_block;
-		int var7 = var0.field3732;
+		int var7 = var0.field3720;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3750 + 1;
+		int var12 = var0.field3745 + 1;
 
 		label61:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field3713;
+		int var13 = var0.field3718;
-		var0.field3713 += var10 - var10;
+		var0.field3718 += var10 - var10;
-		if (var0.field3713 < var13) {
+		if (var0.field3718 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		DirectByteArrayCopier.BZip2Decompressor_block = var6;
+		class162.BZip2Decompressor_block = var6;
-		var0.field3732 = var7;
+		var0.field3720 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkj;)V"
+		signature = "(Lky;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -193,8 +193,8 @@ public final class BZip2Decompressor {
 		int[] var24 = null;
 		int[] var25 = null;
 		var0.blockSize100k = 1410065408;
-		if (DirectByteArrayCopier.BZip2Decompressor_block == null) {
+		if (class162.BZip2Decompressor_block == null) {
-			DirectByteArrayCopier.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
+			class162.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
 		}
 
 		boolean var26 = true;
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++;
-							DirectByteArrayCopier.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							class162.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) {
-								DirectByteArrayCopier.BZip2Decompressor_block[var47] = var1 & 255;
+								class162.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(DirectByteArrayCopier.BZip2Decompressor_block[var36] & 255);
+						var1 = (byte)(class162.BZip2Decompressor_block[var36] & 255);
-						var10000 = DirectByteArrayCopier.BZip2Decompressor_block;
+						var10000 = class162.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field3732 = DirectByteArrayCopier.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3720 = class162.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3732 = DirectByteArrayCopier.BZip2Decompressor_block[var0.field3732];
+					var0.field3720 = class162.BZip2Decompressor_block[var0.field3720];
-					var0.su_ch2 = (byte)(var0.field3732 & 255);
+					var0.su_ch2 = (byte)(var0.field3720 & 255);
-					var0.field3732 >>= 8;
+					var0.field3720 >>= 8;
 					++var0.nblocks_used;
-					var0.field3750 = var47;
+					var0.field3745 = var47;
-					method5705(var0);
+					method5897(var0);
-					if (var0.field3750 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					if (var0.field3745 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkj;)B"
+		signature = "(Lky;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkj;)B"
+		signature = "(Lky;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(ILkj;)I"
+		signature = "(ILky;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lkj;)V"
+		signature = "(Lky;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@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,175 +2,168 @@ 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("kj")
+@ObfuscatedName("ky")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("eg")
+	@ObfuscatedName("a")
-	@ObfuscatedGetter(
+	final int field3709;
-		intValue = -1555084527
+	@ObfuscatedName("t")
-	)
+	final int field3732;
-	@Export("port2")
-	static int port2;
-	@ObfuscatedName("z")
-	final int field3723;
 	@ObfuscatedName("n")
-	final int field3740;
+	final int field3734;
-	@ObfuscatedName("v")
-	final int field3749;
-	@ObfuscatedName("u")
-	final int field3729;
-	@ObfuscatedName("r")
-	final int field3717;
-	@ObfuscatedName("p")
-	final int field3730;
 	@ObfuscatedName("q")
+	final int field3711;
+	@ObfuscatedName("v")
+	final int field3712;
+	@ObfuscatedName("l")
+	final int field3713;
+	@ObfuscatedName("c")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1460237959
+		intValue = -502427743
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 19255173
+		intValue = -561445913
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 577933795
+		intValue = -871682081
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1492713953
+		intValue = -661840641
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1053795843
+		intValue = 77506983
 	)
-	int field3713;
+	int field3718;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 423882031
+		intValue = -250901683
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1870654053
+		intValue = 2016386947
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("t")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 2034972657
+		intValue = 1150627855
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1804549120
+		intValue = 1637628928
 	)
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -2121773995
+		intValue = 1744345569
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1375440771
+		intValue = 1139360211
 	)
-	int field3732;
+	int field3720;
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1764835615
+		intValue = -2116705151
 	)
 	@Export("su_ch2")
 	int su_ch2;
 	@ObfuscatedName("f")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("j")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1747033841
+		intValue = -271375789
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("d")
+	@ObfuscatedName("w")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("k")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1244375945
+		intValue = 1457092991
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aa")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("az")
+	@ObfuscatedName("aw")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ar")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("aq")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ad")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ag")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ak")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("av")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("as")
+	@ObfuscatedName("am")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ax")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("al")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 648150601
+		intValue = 1163964567
 	)
-	int field3750;
+	int field3745;
 
 	BZip2State() {
-		this.field3723 = 4096;
+		this.field3709 = 4096;
-		this.field3740 = 16;
+		this.field3732 = 16;
-		this.field3749 = 258;
+		this.field3734 = 258;
-		this.field3729 = 6;
+		this.field3711 = 6;
-		this.field3717 = 50;
+		this.field3712 = 50;
-		this.field3730 = 18002;
+		this.field3713 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -188,23 +181,4 @@ public final class BZip2State {
 		this.perm = new int[6][258];
 		this.minLens = new int[6];
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(B)[Lkc;",
-		garbageValue = "-127"
-	)
-	@Export("ChatMode_values")
-	static PrivateChatMode[] ChatMode_values() {
-		return new PrivateChatMode[]{PrivateChatMode.field3792, PrivateChatMode.field3790, PrivateChatMode.field3791};
-	}
-
-	@ObfuscatedName("hy")
-	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "157596925"
-	)
-	static boolean method5703(int var0) {
-		return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30;
-	}
 }

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

@@ -4,66 +4,62 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eo")
+@ObfuscatedName("et")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("dc")
+	@ObfuscatedName("r")
-	@ObfuscatedSignature(
+	static String[] field1859;
-		signature = "Lie;"
+	@ObfuscatedName("a")
-	)
-	@Export("archive3")
-	static Archive archive3;
-	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -21907105
+		intValue = -14166733
-	)
-	@Export("orientationA")
-	int orientationA;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = 614934347
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -602196191
+		intValue = -591706183
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1866626591
+		intValue = -1799577875
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("r")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1916194803
+		intValue = 1720763557
+	)
+	@Export("orientationA")
+	int orientationA;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1635831629
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ler;"
+		signature = "Lep;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ler;"
+		signature = "Lep;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = 7018407287880452951L
+		longValue = 7223116526443198487L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -461421073
+		intValue = 1447474805
 	)
 	@Export("flags")
 	int flags;
@@ -73,12 +69,101 @@ public final class BoundaryObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("ko")
 	@ObfuscatedSignature(
-		signature = "(CB)Z",
+		signature = "(I)V",
-		garbageValue = "31"
+		garbageValue = "1336245402"
 	)
-	static final boolean method3226(char var0) {
+	static void method3393() {
-		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
+		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) {
+			int var1 = var0.group;
+			if (TextureProvider.loadInterface(var1)) {
+				boolean var2 = true;
+				Widget[] var3 = Widget.Widget_interfaceComponents[var1];
+
+				int var4;
+				for (var4 = 0; var4 < var3.length; ++var4) {
+					if (var3[var4] != null) {
+						var2 = var3[var4].isIf3;
+						break;
+					}
+				}
+
+				if (!var2) {
+					var4 = (int)var0.key;
+					Widget var5 = PacketBufferNode.getWidget(var4);
+					if (var5 != null) {
+						GrandExchangeOfferAgeComparator.invalidateWidget(var5);
+					}
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("lw")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZI)V",
+		garbageValue = "-2087337765"
+	)
+	@Export("findItemDefinitions")
+	static void findItemDefinitions(String var0, boolean var1) {
+		var0 = var0.toLowerCase();
+		short[] var2 = new short[16];
+		int var3 = 0;
+
+		for (int var4 = 0; var4 < ItemDefinition.ItemDefinition_fileCount; ++var4) {
+			ItemDefinition var5 = class222.ItemDefinition_get(var4);
+			if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
+				if (var3 >= 250) {
+					MouseHandler.foundItemIdCount = -1;
+					UserComparator4.foundItemIds = null;
+					return;
+				}
+
+				if (var3 >= var2.length) {
+					short[] var6 = new short[var2.length * 2];
+
+					for (int var7 = 0; var7 < var3; ++var7) {
+						var6[var7] = var2[var7];
+					}
+
+					var2 = var6;
+				}
+
+				var2[var3++] = (short)var4;
+			}
+		}
+
+		UserComparator4.foundItemIds = var2;
+		WorldMapManager.foundItemIndex = 0;
+		MouseHandler.foundItemIdCount = var3;
+		String[] var8 = new String[MouseHandler.foundItemIdCount];
+
+		for (int var9 = 0; var9 < MouseHandler.foundItemIdCount; ++var9) {
+			var8[var9] = class222.ItemDefinition_get(var2[var9]).name;
+		}
+
+		short[] var10 = UserComparator4.foundItemIds;
+		RouteStrategy.sortItemsByName(var8, var10, 0, var8.length - 1);
+	}
+
+	@ObfuscatedName("lj")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "124156386"
+	)
+	static void method3394() {
+		if (GrandExchangeOfferWorldComparator.field30 != null) {
+			Client.field900 = Client.cycle;
+			GrandExchangeOfferWorldComparator.field30.method4482();
+
+			for (int var0 = 0; var0 < Client.players.length; ++var0) {
+				if (Client.players[var0] != null) {
+					GrandExchangeOfferWorldComparator.field30.method4476(UserComparator8.baseX * 64 + (Client.players[var0].x >> 7), HealthBar.baseY * 64 + (Client.players[var0].y >> 7));
+				}
+			}
+		}
+
 	}
 }

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

@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ll")
+@ObfuscatedName("ls")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -479130629
+		intValue = -1735724601
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 724783571
+		intValue = -701395687
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1669121479
+		intValue = -825003219
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1354833317
+		intValue = 1589322753
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "166241873"
+		garbageValue = "0"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "1712715973"
+		garbageValue = "-111"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,22 +63,22 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lll;Lll;I)V",
+		signature = "(Lls;Lls;I)V",
-		garbageValue = "2079875928"
+		garbageValue = "478225673"
 	)
-	public void method5913(Bounds var1, Bounds var2) {
+	public void method6081(Bounds var1, Bounds var2) {
-		this.method5927(var1, var2);
+		this.method6097(var1, var2);
-		this.method5914(var1, var2);
+		this.method6085(var1, var2);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lll;Lll;B)V",
+		signature = "(Lls;Lls;I)V",
-		garbageValue = "-1"
+		garbageValue = "-1348909503"
 	)
-	void method5927(Bounds var1, Bounds var2) {
+	void method6097(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
@@ -86,8 +86,8 @@ public class Bounds {
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method5916() > var1.method5916()) {
+		if (var2.method6086() > var1.method6086()) {
-			var2.highX -= var2.method5916() - var1.method5916();
+			var2.highX -= var2.method6086() - var1.method6086();
 		}
 
 		if (var2.highX < 0) {
@@ -96,12 +96,12 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lll;Lll;I)V",
+		signature = "(Lls;Lls;B)V",
-		garbageValue = "-1654040739"
+		garbageValue = "1"
 	)
-	void method5914(Bounds var1, Bounds var2) {
+	void method6085(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
@@ -109,8 +109,8 @@ public class Bounds {
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method5912() > var1.method5912()) {
+		if (var2.method6087() > var1.method6087()) {
-			var2.highY -= var2.method5912() - var1.method5912();
+			var2.highY -= var2.method6087() - var1.method6087();
 		}
 
 		if (var2.highY < 0) {
@@ -119,22 +119,22 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		signature = "(I)I",
-		garbageValue = "769635987"
-	)
-	int method5916() {
-		return this.lowX + this.highX;
-	}
-
-	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "59"
+		garbageValue = "-20"
 	)
-	int method5912() {
+	int method6086() {
-		return this.highY + this.lowY;
+		return this.highX + this.lowX;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(B)I",
+		garbageValue = "-30"
+	)
+	int method6087() {
+		return this.lowY + this.highY;
 	}
 
 	public String toString() {

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

@@ -3,26 +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("jl")
+@ObfuscatedName("jx")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1753766973
+		intValue = 1646057305
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1761858423
+		intValue = 1797004239
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1627143829
+		intValue = 48717521
 	)
 	@Export("rank")
 	public int rank;
@@ -31,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "-736416010"
+		garbageValue = "-15"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -42,17 +41,17 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("bl")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-516703486"
+		garbageValue = "-319513783"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
 		signature = "(B)Z",
 		garbageValue = "0"
@@ -62,364 +61,100 @@ public class Buddy extends User {
 		return this.world > 0;
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
+		signature = "(CI)C",
-		garbageValue = "1426462552"
+		garbageValue = "129853061"
 	)
-	static int method5111(int var0, Script var1, boolean var2) {
+	public static char method5286(char var0) {
-		if (var0 == ScriptOpcodes.FRIEND_COUNT) {
+		switch(var0) {
-			if (Tiles.friendSystem.field1052 == 0) {
+		case ' ':
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2;
+		case '-':
-			} else if (Tiles.friendSystem.field1052 == 1) {
+		case '_':
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+		case ' ':
-			} else {
+			return '_';
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.friendsList.getSize();
+		case '#':
-			}
+		case '[':
-
+		case ']':
-			return 1;
+			return var0;
-		} else {
+		case 'À':
-			int var3;
+		case 'Á':
-			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
+		case 'Â':
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+		case 'Ã':
-				if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
+		case 'Ä':
-					Friend var8 = (Friend)Tiles.friendSystem.friendsList.get(var3);
+		case 'à':
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName();
+		case 'á':
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName();
+		case 'â':
-				} else {
+		case 'ã':
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+		case 'ä':
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+			return 'a';
-				}
+		case 'Ç':
-
+		case 'ç':
-				return 1;
+			return 'c';
-			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
+		case 'È':
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+		case 'É':
-				if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
+		case 'Ê':
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Tiles.friendSystem.friendsList.get(var3)).world;
+		case 'Ë':
-				} else {
+		case 'è':
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+		case 'é':
-				}
+		case 'ê':
-
+		case 'ë':
-				return 1;
+			return 'e';
-			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
+		case 'Í':
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+		case 'Î':
-				if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
+		case 'Ï':
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Tiles.friendSystem.friendsList.get(var3)).rank;
+		case 'í':
-				} else {
+		case 'î':
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+		case 'ï':
-				}
+			return 'i';
-
+		case 'Ñ':
-				return 1;
+		case 'ñ':
-			} else {
+			return 'n';
-				String var5;
+		case 'Ò':
-				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+		case 'Ó':
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+		case 'Ô':
-					int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+		case 'Õ':
-					NPC.method2050(var5, var6);
+		case 'Ö':
-					return 1;
+		case 'ò':
-				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+		case 'ó':
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+		case 'ô':
-					Tiles.friendSystem.addFriend(var5);
+		case 'õ':
-					return 1;
+		case 'ö':
-				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+			return 'o';
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+		case 'Ù':
-					Tiles.friendSystem.removeFriend(var5);
+		case 'Ú':
-					return 1;
+		case 'Û':
-				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+		case 'Ü':
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+		case 'ù':
-					Tiles.friendSystem.addIgnore(var5);
+		case 'ú':
-					return 1;
+		case 'û':
-				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+		case 'ü':
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+			return 'u';
-					Tiles.friendSystem.removeIgnore(var5);
+		case 'ß':
-					return 1;
+			return 'b';
-				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+		case 'ÿ':
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+		case 'Ÿ':
-					var5 = WorldMapSectionType.method250(var5);
+			return 'y';
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.isFriended(new Username(var5, WorldMapSection1.loginType), false) ? 1 : 0;
+		default:
-					return 1;
+			return Character.toLowerCase(var0);
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
-					if (Varps.clanChat != null) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Varps.clanChat.name;
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
-					if (Varps.clanChat != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.clanChat.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 (Varps.clanChat != null && var3 < Varps.clanChat.getSize()) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Varps.clanChat.get(var3).getUsername().getName();
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Varps.clanChat.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 (Varps.clanChat != null && var3 < Varps.clanChat.getSize()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Varps.clanChat.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] = Varps.clanChat != null ? Varps.clanChat.minKick : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-					NetCache.clanKickUser(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.clanChat != null ? Varps.clanChat.rank : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-					World.Clan_joinChat(var5);
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
-					WorldMapLabel.Clan_leaveChat();
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
-					if (!Tiles.friendSystem.method1863()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.ignoreList.getSize();
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (Tiles.friendSystem.method1863() && var3 >= 0 && var3 < Tiles.friendSystem.ignoreList.getSize()) {
-						Ignored var4 = (Ignored)Tiles.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 = WorldMapSectionType.method250(var5);
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.isIgnored(new Username(var5, WorldMapSection1.loginType)) ? 1 : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize() && Varps.clanChat.get(var3).getUsername().equals(class223.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 (Varps.clanChat != null && Varps.clanChat.owner != null) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Varps.clanChat.owner;
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize() && ((ClanMate)Varps.clanChat.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) {
-						Tiles.friendSystem.friendsList.removeComparator();
-						return 1;
-					} else {
-						boolean var7;
-						if (var0 == 3629) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator1(var7));
-							return 1;
-						} else if (var0 == 3630) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator2(var7));
-							return 1;
-						} else if (var0 == 3631) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator3(var7));
-							return 1;
-						} else if (var0 == 3632) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator4(var7));
-							return 1;
-						} else if (var0 == 3633) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator5(var7));
-							return 1;
-						} else if (var0 == 3634) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator6(var7));
-							return 1;
-						} else if (var0 == 3635) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator7(var7));
-							return 1;
-						} else if (var0 == 3636) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator8(var7));
-							return 1;
-						} else if (var0 == 3637) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator9(var7));
-							return 1;
-						} else if (var0 == 3638) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new UserComparator10(var7));
-							return 1;
-						} else if (var0 == 3639) {
-							Tiles.friendSystem.friendsList.sort();
-							return 1;
-						} else if (var0 == 3640) {
-							Tiles.friendSystem.ignoreList.removeComparator();
-							return 1;
-						} else if (var0 == 3641) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
-							return 1;
-						} else if (var0 == 3642) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
-							return 1;
-						} else if (var0 == 3643) {
-							Tiles.friendSystem.ignoreList.sort();
-							return 1;
-						} else if (var0 == 3644) {
-							if (Varps.clanChat != null) {
-								Varps.clanChat.removeComparator();
-							}
-
-							return 1;
-						} else if (var0 == 3645) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator1(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3646) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator2(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3647) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator3(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3648) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator4(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3649) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator5(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3650) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator6(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3651) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator7(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3652) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator8(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3653) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator9(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3654) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new UserComparator10(var7));
-							}
-
-							return 1;
-						} else if (var0 == 3655) {
-							if (Varps.clanChat != null) {
-								Varps.clanChat.sort();
-							}
-
-							return 1;
-						} else if (var0 == 3656) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							Tiles.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7));
-							return 1;
-						} else if (var0 == 3657) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							if (Varps.clanChat != null) {
-								Varps.clanChat.addComparator(new BuddyRankComparator(var7));
-							}
-
-							return 1;
-						} else {
-							return 2;
-						}
-					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize() && ((ClanMate)Varps.clanChat.get(var3)).isIgnored()) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				}
-			}
 		}
 	}
+
+	@ObfuscatedName("ah")
+	@ObfuscatedSignature(
+		signature = "(IB)I",
+		garbageValue = "116"
+	)
+	static int method5298(int var0) {
+		return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F));
+	}
+
+	@ObfuscatedName("bh")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "-2095111578"
+	)
+	public static int method5297(String var0) {
+		return var0.length() + 2;
+	}
 }

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

@@ -3,10 +3,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fd")
+@ObfuscatedName("fs")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("z")
+	@ObfuscatedName("do")
+	@ObfuscatedSignature(
+		signature = "Lij;"
+	)
+	@Export("archive0")
+	static Archive archive0;
+	@ObfuscatedName("a")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -14,10 +20,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljl;Ljl;I)I",
+		signature = "(Ljx;Ljx;I)I",
-		garbageValue = "-1443378495"
+		garbageValue = "63405397"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -32,13 +38,60 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("hs")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(Lij;IIIBZI)V",
-		garbageValue = "96"
+		garbageValue = "-1505675157"
 	)
-	@Export("getNewestMenuIdx")
+	@Export("requestNetFile")
-	static final int getNewestMenuIdx() {
+	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
-		return Client.menuOptionsCount - 1;
+		long var6 = (long)((var1 << 16) + var2);
+		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
+		if (var8 == null) {
+			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
+			if (var8 == null) {
+				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
+				if (var8 != null) {
+					if (var5) {
+						var8.removeDual();
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
+						--NetCache.NetCache_pendingWritesCount;
+						++NetCache.NetCache_pendingPriorityWritesCount;
+					}
+
+				} else {
+					if (!var5) {
+						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
+						if (var8 != null) {
+							return;
+						}
+					}
+
+					var8 = new NetFileRequest();
+					var8.archive = var0;
+					var8.crc = var3;
+					var8.padding = var4;
+					if (var5) {
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
+						++NetCache.NetCache_pendingPriorityWritesCount;
+					} else {
+						NetCache.NetCache_pendingWritesQueue.addFirst(var8);
+						NetCache.NetCache_pendingWrites.put(var8, var6);
+						++NetCache.NetCache_pendingWritesCount;
+					}
+
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "2092280519"
+	)
+	public static void method3568() {
+		SequenceDefinition.SequenceDefinition_cached.clear();
+		SequenceDefinition.SequenceDefinition_cachedFrames.clear();
 	}
 }

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

@@ -6,66 +6,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mm")
+@ObfuscatedName("mz")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "Lmh;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = -7294963934648719297L
+		longValue = -3262164853072505693L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1845108509
+		intValue = -773924091
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = -8408813098273597985L
+		longValue = 2584269110563809293L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1704738159
+		intValue = 2068321047
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = -7862153769092129291L
+		longValue = 6372981625088766905L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = 3070804450108675653L
+		longValue = 7685888135171302975L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 8830743471394433983L
+		longValue = -4038469138705030175L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = 3243026924650541047L
+		longValue = 8140662089348975089L
 	)
 	@Export("fileOffset")
 	long fileOffset;
@@ -84,10 +84,10 @@ public class BufferedFile {
 		this.offset = 0L;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-55"
+		garbageValue = "57"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(S)J",
+		signature = "(B)J",
-		garbageValue = "15865"
+		garbageValue = "87"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BS)V",
-		garbageValue = "588547682"
+		garbageValue = "1024"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "-41"
+		garbageValue = "2116217795"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) {
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3);
 				this.offset += (long)var3;
 				return;
@@ -146,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset;
 			int var7 = var3;
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset));
 				if (var8 > var3) {
 					var8 = var3;
@@ -202,14 +202,14 @@ public class BufferedFile {
 				long var10 = -1L;
 				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) {
 					var13 = this.writeBufferOffset;
-				} else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) {
+				} else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) {
 					var13 = var4;
 				}
 
-				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) {
+				if ((long)this.writeBufferLength + this.writeBufferOffset > 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 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) {
-					var10 = (long)var7 + var4;
+					var10 = var4 + (long)var7;
 				}
 
 				if (var13 > -1L && var10 > var13) {
@@ -231,15 +231,15 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "77"
+		garbageValue = "27"
 	)
 	@Export("load")
 	void load() throws IOException {
 		this.readBufferLength = 0;
-		if (this.offset != this.fileOffset) {
+		if (this.fileOffset != this.offset) {
 			this.accessFile.seek(this.offset);
 			this.fileOffset = this.offset;
 		}
@@ -261,23 +261,23 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "2016597591"
+		garbageValue = "2065277497"
 	)
 	@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 = (long)var3 + this.offset;
+				this.length = this.offset + (long)var3;
 			}
 
-			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
+			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) {
 				this.flush();
 			}
 
-			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) {
+			if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) {
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset));
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4);
 				this.offset += (long)var4;
@@ -316,14 +316,14 @@ public class BufferedFile {
 				long var6 = -1L;
 				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 					var9 = this.offset;
-				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) {
+				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) {
 					var9 = this.readBufferOffset;
 				}
 
-				if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) {
+				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) {
-					var6 = this.offset + (long)var3;
+					var6 = (long)var3 + this.offset;
-				} else if (this.readBufferOffset + (long)this.readBufferLength > 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 = (long)this.readBufferLength + this.readBufferOffset;
+					var6 = this.readBufferOffset + (long)this.readBufferLength;
 				}
 
 				if (var9 > -1L && var6 > var9) {
@@ -339,21 +339,21 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "928727943"
+		garbageValue = "4"
 	)
 	@Export("flush")
 	void flush() throws IOException {
-		if (-1L != this.writeBufferOffset) {
+		if (this.writeBufferOffset != -1L) {
 			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 * -1599618673) * 1704738159L;
+			this.fileOffset += 2068321047L * (long)(this.writeBufferLength * 1929925799);
 			if (this.fileOffset > this.fileLength) {
 				this.fileLength = this.fileOffset;
 			}
@@ -362,14 +362,14 @@ public class BufferedFile {
 			long var3 = -1L;
 			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) {
 				var1 = this.writeBufferOffset;
-			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) {
+			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) {
 				var1 = this.readBufferOffset;
 			}
 
 			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) {
 				var3 = (long)this.writeBufferLength + this.writeBufferOffset;
-			} else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= 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 = (long)this.readBufferLength + this.readBufferOffset;
+				var3 = this.readBufferOffset + (long)this.readBufferLength;
 			}
 
 			if (var1 > -1L && var3 > var1) {

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

@@ -1,38 +1,30 @@
 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.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kd")
+@ObfuscatedName("kg")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 966969419
-	)
-	@Export("cacheGamebuild")
-	public static int cacheGamebuild;
-	@ObfuscatedName("z")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lkx;"
+		signature = "Lkl;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lkn;"
 	)
 	@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);
@@ -42,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-119"
+		garbageValue = "1632517280"
 	)
 	@Export("close")
 	public void close() {
@@ -59,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "1784126558"
+		garbageValue = "0"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "3"
+		garbageValue = "-1"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-336706705"
+		garbageValue = "1174929907"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-2035668362"
+		garbageValue = "1681485484"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "-68"
+		garbageValue = "1989353375"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -112,44 +104,4 @@ public class BufferedNetSocket extends AbstractSocket {
 	protected void finalize() {
 		this.close();
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "2009022285"
-	)
-	@Export("loadWorlds")
-	static boolean loadWorlds() {
-		try {
-			if (class51.World_request == null) {
-				class51.World_request = Client.urlRequester.request(new URL(WorldMapSectionType.field150));
-			} else if (class51.World_request.isDone()) {
-				byte[] var0 = class51.World_request.getResponse();
-				Buffer var1 = new Buffer(var0);
-				var1.readInt();
-				World.World_count = var1.readUnsignedShort();
-				World.World_worlds = new World[World.World_count];
-
-				World var3;
-				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) {
-					var3 = World.World_worlds[var2] = new World();
-					var3.id = var1.readUnsignedShort();
-					var3.properties = var1.readInt();
-					var3.host = var1.readStringCp1252NullTerminated();
-					var3.activity = var1.readStringCp1252NullTerminated();
-					var3.location = var1.readUnsignedByte();
-					var3.population = var1.readShort();
-				}
-
-				WorldMapData_0.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
-				class51.World_request = null;
-				return true;
-			}
-		} catch (Exception var4) {
-			var4.printStackTrace();
-			class51.World_request = null;
-		}
-
-		return false;
-	}
 }

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

@@ -6,46 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kv")
+@ObfuscatedName("kn")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("e")
+	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "Lbr;"
-	)
-	@Export("loginScreenRunesAnimation")
-	static LoginScreenAnimation loginScreenRunesAnimation;
-	@ObfuscatedName("z")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1047270953
+		intValue = 1704761219
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 205486611
+		intValue = -1398859285
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1646863699
+		intValue = 1220399631
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("closed")
 	boolean closed;
 
@@ -60,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "-57"
+		garbageValue = "-1040331430"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -85,10 +79,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "30"
+		garbageValue = "-2046611751"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -125,10 +119,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1627292871"
+		garbageValue = "96034687"
 	)
 	@Export("close")
 	void close() {
@@ -203,72 +197,4 @@ public class BufferedSink implements Runnable {
 		} while(!this.isClosed());
 
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(Lli;I)I",
-		garbageValue = "-828018974"
-	)
-	static final int method5794(LoginType var0) {
-		if (var0 == null) {
-			return 12;
-		} else {
-			switch(var0.field4033) {
-			case 0:
-				return 20;
-			default:
-				return 12;
-			}
-		}
-	}
-
-	@ObfuscatedName("fm")
-	@ObfuscatedSignature(
-		signature = "(Lho;IIB)V",
-		garbageValue = "-112"
-	)
-	@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 || !WorldMapIcon_1.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 + var4 * var8 >> 11;
-					int var10 = var5 * var8 - var7 * var4 >> 11;
-					int var11 = var9 + class223.localPlayer.x >> 7;
-					int var12 = class223.localPlayer.y - var10 >> 7;
-					PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher);
-					var13.packetBuffer.writeByte(18);
-					var13.packetBuffer.writeShortLE(class223.baseX * 64 + var11);
-					var13.packetBuffer.method5476(class286.baseY * 64 + var12);
-					var13.packetBuffer.method5468(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
-					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(class223.localPlayer.x);
-					var13.packetBuffer.writeShort(class223.localPlayer.y);
-					var13.packetBuffer.writeByte(63);
-					Client.packetWriter.addNode(var13);
-					Client.destinationX = var11;
-					Client.destinationY = var12;
-				}
-			}
-
-		}
-	}
 }

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("kx")
+@ObfuscatedName("kl")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1837703949
+		intValue = -1673259479
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 496960127
+		intValue = 571240185
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -589477741
+		intValue = -143003191
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("exception")
 	IOException exception;
 
@@ -52,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "-42"
+		garbageValue = "1194815492"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(S)I",
-		garbageValue = "-99"
+		garbageValue = "256"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,15 +110,15 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1540455812"
+		garbageValue = "418616079"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
 		synchronized(this) {
-			if (this.limit == this.position) {
+			if (this.position == this.limit) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
 				} else {
@@ -133,10 +133,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "2103598010"
+		garbageValue = "153221716"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "2069219110"
+		garbageValue = "-206595375"
 	)
 	@Export("close")
 	void close() {
@@ -243,4 +243,26 @@ public class BufferedSource implements Runnable {
 			}
 		}
 	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(II)Lio;",
+		garbageValue = "-139133141"
+	)
+	@Export("KitDefinition_get")
+	public static KitDefinition KitDefinition_get(int var0) {
+		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
+			var1 = new KitDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			KitDefinition.KitDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
 }

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("fl")
+@ObfuscatedName("fq")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("byteArray")
 	public byte[] byteArray;
 

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

@@ -1,45 +1,49 @@
+import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kt")
+@ObfuscatedName("kz")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1085109787
+		intValue = -261452537
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -745592959
+		intValue = -718717257
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1171490501
+		intValue = -1909793595
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("ByteArrayPool_alternativeSizes")
-	public static int[] ByteArrayPool_alternativeSizes;
+	static int[] ByteArrayPool_alternativeSizes;
-	@ObfuscatedName("m")
+	@ObfuscatedName("h")
-	@Export("ByteArrayPool_altSizeArrayCounts")
+	@ObfuscatedSignature(
-	public static int[] ByteArrayPool_altSizeArrayCounts;
+		signature = "Ldm;"
+	)
+	@Export("soundCache")
+	public static SoundCache soundCache;
 
 	static {
 		ByteArrayPool_smallCount = 0;
@@ -50,10 +54,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IZB)[B",
+		signature = "(IZI)[B",
-		garbageValue = "-44"
+		garbageValue = "77699142"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -85,14 +89,14 @@ public class ByteArrayPool {
 			return var2;
 		}
 
-		if (class81.ByteArrayPool_arrays != null) {
+		if (HorizontalAlignment.ByteArrayPool_arrays != null) {
 			for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) {
 				if (ByteArrayPool_alternativeSizes[var4] != var0) {
 					if (var0 < ByteArrayPool_alternativeSizes[var4]) {
 					}
-				} else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+				} else if (class222.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
-					byte[] var3 = class81.ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]];
+					byte[] var3 = HorizontalAlignment.ByteArrayPool_arrays[var4][--class222.ByteArrayPool_altSizeArrayCounts[var4]];
-					class81.ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null;
+					HorizontalAlignment.ByteArrayPool_arrays[var4][class222.ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}
@@ -100,4 +104,46 @@ public class ByteArrayPool {
 
 		return new byte[var0];
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmf;"
+	)
+	@Export("newRunException")
+	public static RunException newRunException(Throwable var0, String var1) {
+		RunException var2;
+		if (var0 instanceof RunException) {
+			var2 = (RunException)var0;
+			var2.message = var2.message + ' ' + var1;
+		} else {
+			var2 = new RunException(var0, var1);
+		}
+
+		return var2;
+	}
+
+	@ObfuscatedName("ke")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1348959879"
+	)
+	@Export("FriendSystem_invalidateFriends")
+	static final void FriendSystem_invalidateFriends() {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
+			Player var1 = Client.players[Players.Players_indices[var0]];
+			var1.clearIsFriend();
+		}
+
+		Iterator var2 = Messages.Messages_hashTable.iterator();
+
+		while (var2.hasNext()) {
+			Message var3 = (Message)var2.next();
+			var3.clearIsFromFriend();
+		}
+
+		if (class4.clanChat != null) {
+			class4.clanChat.clearFriends();
+		}
+
+	}
 }

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

@@ -4,18 +4,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gz")
+@ObfuscatedName("gi")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("DAYS_OF_THE_WEEK")
 	public static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("Calendar_calendar")
 	public static java.util.Calendar Calendar_calendar;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		signature = "Lkc;"
+	)
+	@Export("NetCache_reference")
+	public static Buffer NetCache_reference;
 
 	static {
 		MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}};
@@ -24,38 +30,86 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Lho;I[B[BB)V",
+		signature = "(I)I",
-		garbageValue = "-75"
+		garbageValue = "-2132557577"
 	)
-	@Export("Widget_setKey")
+	static final int method4102() {
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		return ViewportMouse.ViewportMouse_x;
-		if (var0.field2552 == null) {
+	}
-			if (var2 == null) {
-				return;
-			}
 
-			var0.field2552 = new byte[11][];
+	@ObfuscatedName("gd")
-			var0.field2621 = new byte[11][];
+	@ObfuscatedSignature(
-			var0.field2586 = new int[11];
+		signature = "(IIIIZI)V",
-			var0.field2548 = new int[11];
+		garbageValue = "399120527"
+	)
+	@Export("setViewportShape")
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) {
+			var2 = 1;
 		}
 
-		var0.field2552[var1] = var2;
+		if (var3 < 1) {
-		if (var2 != null) {
+			var3 = 1;
-			var0.field2619 = true;
+		}
+
+		int var5 = var3 - 334;
+		int var6;
+		if (var5 < 0) {
+			var6 = Client.field881;
+		} else if (var5 >= 100) {
+			var6 = Client.field882;
 		} else {
-			var0.field2619 = false;
+			var6 = (Client.field882 - Client.field881) * var5 / 100 + Client.field881;
+		}
 
-			for (int var4 = 0; var4 < var0.field2552.length; ++var4) {
+		int var7 = var3 * var6 * 512 / (var2 * 334);
-				if (var0.field2552[var4] != null) {
+		int var8;
-					var0.field2619 = true;
+		int var9;
-					break;
+		short var10;
+		if (var7 < Client.field844) {
+			var10 = Client.field844;
+			var6 = var10 * var2 * 334 / (var3 * 512);
+			if (var6 > Client.field886) {
+				var6 = Client.field886;
+				var8 = var3 * var6 * 512 / (var10 * 334);
+				var9 = (var2 - var8) / 2;
+				if (var4) {
+					Rasterizer2D.Rasterizer2D_resetClip();
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
 				}
+
+				var0 += var9;
+				var2 -= var9 * 2;
+			}
+		} else if (var7 > Client.field888) {
+			var10 = Client.field888;
+			var6 = var10 * var2 * 334 / (var3 * 512);
+			if (var6 < Client.field885) {
+				var6 = Client.field885;
+				var8 = var10 * var2 * 334 / (var6 * 512);
+				var9 = (var3 - var8) / 2;
+				if (var4) {
+					Rasterizer2D.Rasterizer2D_resetClip();
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
+				}
+
+				var1 += var9;
+				var3 -= var9 * 2;
 			}
 		}
 
-		var0.field2621[var1] = var3;
+		Client.viewportZoom = var3 * var6 / 334;
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
+			class192.method3813(var2, var3);
+		}
+
+		Client.viewportOffsetX = var0;
+		Client.viewportOffsetY = var1;
+		Client.viewportWidth = var2;
+		Client.viewportHeight = var3;
 	}
 }

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

@@ -4,12 +4,11 @@ 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("ay")
+@ObfuscatedName("ai")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("component")
 	Component component;
 
@@ -17,127 +16,83 @@ public final class Canvas extends java.awt.Canvas {
 		this.component = var1;
 	}
 
-	public final void update(Graphics var1) {
-		this.component.update(var1);
-	}
-
 	public final void paint(Graphics var1) {
 		this.component.paint(var1);
 	}
 
-	@ObfuscatedName("n")
+	public final void update(Graphics var1) {
-	@ObfuscatedSignature(
+		this.component.update(var1);
-		signature = "(II)Lho;",
-		garbageValue = "313560965"
-	)
-	@Export("getWidget")
-	public static Widget getWidget(int var0) {
-		int var1 = var0 >> 16;
-		int var2 = var0 & 65535;
-		if (UserComparator5.Widget_interfaceComponents[var1] == null || UserComparator5.Widget_interfaceComponents[var1][var2] == null) {
-			boolean var3 = WorldMapData_0.loadInterface(var1);
-			if (!var3) {
-				return null;
-			}
-		}
-
-		return UserComparator5.Widget_interfaceComponents[var1][var2];
 	}
 
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lhp;III)[Llf;",
+		signature = "(IIB)I",
-		garbageValue = "-2024454786"
+		garbageValue = "-116"
 	)
-	@Export("SpriteBuffer_getSpriteArray")
+	static int method935(int var0, int var1) {
-	public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		return !VertexNormal.method2962(var0, var1, var2) ? null : AbstractWorldMapIcon.method642();
+		if (var2 == null) {
-	}
+			return 0;
-
+		} else if (var1 == -1) {
-	@ObfuscatedName("al")
+			return 0;
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
-		garbageValue = "952621968"
-	)
-	static int method889(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.GETWINDOWMODE) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class247.getWindowedMode();
-			return 1;
 		} else {
-			int var3;
+			int var3 = 0;
-			if (var0 == ScriptOpcodes.SETWINDOWMODE) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (var3 == 1 || var3 == 2) {
-					UserComparator8.setWindowedMode(var3);
-				}
 
-				return 1;
+			for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
-			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) {
+				if (var2.ids[var4] == var1) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractArchive.clientPreferences.windowMode;
+					var3 += var2.quantities[var4];
-				return 1;
-			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) {
-				if (var0 == 5310) {
-					--Interpreter.Interpreter_intStackSize;
-					return 1;
-				} else {
-					return 2;
 				}
-			} else {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (var3 == 1 || var3 == 2) {
-					AbstractArchive.clientPreferences.windowMode = var3;
-					Language.savePreferences();
-				}
-
-				return 1;
 			}
+
+			return var3;
 		}
 	}
 
-	@ObfuscatedName("kn")
+	@ObfuscatedName("il")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZI)V",
+		signature = "(ILjava/lang/String;I)V",
-		garbageValue = "328041460"
+		garbageValue = "-1452803850"
 	)
-	@Export("findItemDefinitions")
+	static void method934(int var0, String var1) {
-	static void findItemDefinitions(String var0, boolean var1) {
+		int var2 = Players.Players_count;
-		var0 = var0.toLowerCase();
+		int[] var3 = Players.Players_indices;
-		short[] var2 = new short[16];
+		boolean var4 = false;
-		int var3 = 0;
+		Username var5 = new Username(var1, class60.loginType);
 
-		for (int var4 = 0; var4 < JagexCache.ItemDefinition_fileCount; ++var4) {
+		for (int var6 = 0; var6 < var2; ++var6) {
-			ItemDefinition var5 = Occluder.ItemDefinition_get(var4);
+			Player var7 = Client.players[var3[var6]];
-			if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
+			if (var7 != null && var7 != class215.localPlayer && var7.username != null && var7.username.equals(var5)) {
-				if (var3 >= 250) {
+				PacketBufferNode var8;
-					DevicePcmPlayerProvider.foundItemIdCount = -1;
+				if (var0 == 1) {
-					WorldMapIcon_0.foundItemIds = null;
+					var8 = SoundSystem.getPacketBufferNode(ClientPacket.field2193, Client.packetWriter.isaacCipher);
-					return;
+					var8.packetBuffer.writeShort(var3[var6]);
+					var8.packetBuffer.writeByte(0);
+					Client.packetWriter.addNode(var8);
+				} else if (var0 == 4) {
+					var8 = SoundSystem.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.writeShortLE(var3[var6]);
+					var8.packetBuffer.method5634(0);
+					Client.packetWriter.addNode(var8);
+				} else if (var0 == 6) {
+					var8 = SoundSystem.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method5635(0);
+					var8.packetBuffer.writeShort(var3[var6]);
+					Client.packetWriter.addNode(var8);
+				} else if (var0 == 7) {
+					var8 = SoundSystem.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.method5643(var3[var6]);
+					var8.packetBuffer.writeByte(0);
+					Client.packetWriter.addNode(var8);
 				}
 
-				if (var3 >= var2.length) {
+				var4 = true;
-					short[] var6 = new short[var2.length * 2];
+				break;
-
-					for (int var7 = 0; var7 < var3; ++var7) {
-						var6[var7] = var2[var7];
-					}
-
-					var2 = var6;
-				}
-
-				var2[var3++] = (short)var4;
 			}
 		}
 
-		WorldMapIcon_0.foundItemIds = var2;
+		if (!var4) {
-		ReflectionCheck.foundItemIndex = 0;
+			class30.addGameMessage(4, "", "Unable to find " + var1);
-		DevicePcmPlayerProvider.foundItemIdCount = var3;
-		String[] var8 = new String[DevicePcmPlayerProvider.foundItemIdCount];
-
-		for (int var9 = 0; var9 < DevicePcmPlayerProvider.foundItemIdCount; ++var9) {
-			var8[var9] = Occluder.ItemDefinition_get(var2[var9]).name;
 		}
 
-		short[] var10 = WorldMapIcon_0.foundItemIds;
-		GrandExchangeOfferNameComparator.sortItemsByName(var8, var10, 0, var8.length - 1);
 	}
 }

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

@@ -4,18 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cc")
+@ObfuscatedName("cb")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("n")
+	@ObfuscatedName("lb")
 	@ObfuscatedSignature(
-		signature = "[Lbe;"
+		signature = "Lhi;"
+	)
+	@Export("mousedOverWidgetIf1")
+	static Widget mousedOverWidgetIf1;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "[Lbt;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -864101903
+		intValue = -1655773149
 	)
 	@Export("count")
 	int count;
@@ -24,10 +30,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbe;",
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbt;",
-		garbageValue = "56"
+		garbageValue = "-2124852367"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -55,222 +61,49 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)Lbe;",
+		signature = "(II)Lbt;",
-		garbageValue = "601749225"
+		garbageValue = "1546938937"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-135495526"
+		garbageValue = "126"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
 
-	@ObfuscatedName("ft")
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(CI)Z",
+		garbageValue = "1710830217"
+	)
+	@Export("isCharAlphabetic")
+	public static boolean isCharAlphabetic(char var0) {
+		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+	}
+
+	@ObfuscatedName("fz")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "247037730"
+		garbageValue = "-1507769653"
 	)
-	static final void method2237() {
+	@Export("playPcmPlayers")
-		int var0 = class225.field3045 * 128 + 64;
+	static final void playPcmPlayers() {
-		int var1 = Clock.field2039 * 16384 + 64;
+		if (MenuAction.pcmPlayer1 != null) {
-		int var2 = MusicPatchPcmStream.getTileHeight(var0, var1, WorldMapRectangle.plane) - GrandExchangeOfferOwnWorldComparator.field627;
+			MenuAction.pcmPlayer1.run();
-		if (GrandExchangeOfferOwnWorldComparator.cameraX < var0) {
-			GrandExchangeOfferOwnWorldComparator.cameraX = (var0 - GrandExchangeOfferOwnWorldComparator.cameraX) * Messages.field1262 / 1000 + GrandExchangeOfferOwnWorldComparator.cameraX + MouseRecorder.field572;
-			if (GrandExchangeOfferOwnWorldComparator.cameraX > var0) {
-				GrandExchangeOfferOwnWorldComparator.cameraX = var0;
-			}
 		}
 
-		if (GrandExchangeOfferOwnWorldComparator.cameraX > var0) {
+		if (class80.pcmPlayer0 != null) {
-			GrandExchangeOfferOwnWorldComparator.cameraX -= Messages.field1262 * (GrandExchangeOfferOwnWorldComparator.cameraX - var0) / 1000 + MouseRecorder.field572;
+			class80.pcmPlayer0.run();
-			if (GrandExchangeOfferOwnWorldComparator.cameraX < var0) {
-				GrandExchangeOfferOwnWorldComparator.cameraX = var0;
-			}
-		}
-
-		if (Varcs.cameraY < var2) {
-			Varcs.cameraY = (var2 - Varcs.cameraY) * Messages.field1262 / 1000 + Varcs.cameraY + MouseRecorder.field572;
-			if (Varcs.cameraY > var2) {
-				Varcs.cameraY = var2;
-			}
-		}
-
-		if (Varcs.cameraY > var2) {
-			Varcs.cameraY -= Messages.field1262 * (Varcs.cameraY - var2) / 1000 + MouseRecorder.field572;
-			if (Varcs.cameraY < var2) {
-				Varcs.cameraY = var2;
-			}
-		}
-
-		if (WorldMapIcon_1.cameraZ < var1) {
-			WorldMapIcon_1.cameraZ = (var1 - WorldMapIcon_1.cameraZ) * Messages.field1262 / 1000 + WorldMapIcon_1.cameraZ + MouseRecorder.field572;
-			if (WorldMapIcon_1.cameraZ > var1) {
-				WorldMapIcon_1.cameraZ = var1;
-			}
-		}
-
-		if (WorldMapIcon_1.cameraZ > var1) {
-			WorldMapIcon_1.cameraZ -= Messages.field1262 * (WorldMapIcon_1.cameraZ - var1) / 1000 + MouseRecorder.field572;
-			if (WorldMapIcon_1.cameraZ < var1) {
-				WorldMapIcon_1.cameraZ = var1;
-			}
-		}
-
-		var0 = GameShell.field455 * 16384 + 64;
-		var1 = SecureRandomFuture.field1228 * 16384 + 64;
-		var2 = MusicPatchPcmStream.getTileHeight(var0, var1, WorldMapRectangle.plane) - class14.field90;
-		int var3 = var0 - GrandExchangeOfferOwnWorldComparator.cameraX;
-		int var4 = var2 - Varcs.cameraY;
-		int var5 = var1 - WorldMapIcon_1.cameraZ;
-		int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3));
-		int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047;
-		int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047;
-		if (var7 < 128) {
-			var7 = 128;
-		}
-
-		if (var7 > 383) {
-			var7 = 383;
-		}
-
-		if (IgnoreList.cameraPitch < var7) {
-			IgnoreList.cameraPitch = (var7 - IgnoreList.cameraPitch) * ScriptEvent.field570 / 1000 + IgnoreList.cameraPitch + class80.field1126;
-			if (IgnoreList.cameraPitch > var7) {
-				IgnoreList.cameraPitch = var7;
-			}
-		}
-
-		if (IgnoreList.cameraPitch > var7) {
-			IgnoreList.cameraPitch -= ScriptEvent.field570 * (IgnoreList.cameraPitch - var7) / 1000 + class80.field1126;
-			if (IgnoreList.cameraPitch < var7) {
-				IgnoreList.cameraPitch = var7;
-			}
-		}
-
-		int var9 = var8 - WorldMapSection2.cameraYaw;
-		if (var9 > 1024) {
-			var9 -= 2048;
-		}
-
-		if (var9 < -1024) {
-			var9 += 2048;
-		}
-
-		if (var9 > 0) {
-			WorldMapSection2.cameraYaw = WorldMapSection2.cameraYaw + class80.field1126 + var9 * ScriptEvent.field570 / 1000;
-			WorldMapSection2.cameraYaw &= 2047;
-		}
-
-		if (var9 < 0) {
-			WorldMapSection2.cameraYaw -= class80.field1126 + -var9 * ScriptEvent.field570 / 1000;
-			WorldMapSection2.cameraYaw &= 2047;
-		}
-
-		int var10 = var8 - WorldMapSection2.cameraYaw;
-		if (var10 > 1024) {
-			var10 -= 2048;
-		}
-
-		if (var10 < -1024) {
-			var10 += 2048;
-		}
-
-		if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) {
-			WorldMapSection2.cameraYaw = var8;
-		}
-
-	}
-
-	@ObfuscatedName("jx")
-	@ObfuscatedSignature(
-		signature = "(IB)V",
-		garbageValue = "73"
-	)
-	static void method2229(int var0) {
-		ParamDefinition.tempMenuAction = new MenuAction();
-		ParamDefinition.tempMenuAction.argument1 = Client.menuArguments1[var0];
-		ParamDefinition.tempMenuAction.argument2 = Client.menuArguments2[var0];
-		ParamDefinition.tempMenuAction.opcode = Client.menuOpcodes[var0];
-		ParamDefinition.tempMenuAction.argument0 = Client.menuIdentifiers[var0];
-		ParamDefinition.tempMenuAction.action = Client.menuActions[var0];
-	}
-
-	@ObfuscatedName("ja")
-	@ObfuscatedSignature(
-		signature = "([Lho;II)V",
-		garbageValue = "559815398"
-	)
-	@Export("drawModelComponents")
-	static final void drawModelComponents(Widget[] var0, int var1) {
-		for (int var2 = 0; var2 < var0.length; ++var2) {
-			Widget var3 = var0[var2];
-			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !WorldMapSectionType.isComponentHidden(var3))) {
-				int var5;
-				if (var3.type == 0) {
-					if (!var3.isIf3 && WorldMapSectionType.isComponentHidden(var3) && var3 != NetSocket.mousedOverWidgetIf1) {
-						continue;
-					}
-
-					drawModelComponents(var0, var3.id);
-					if (var3.children != null) {
-						drawModelComponents(var3.children, var3.id);
-					}
-
-					InterfaceParent var7 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
-					if (var7 != null) {
-						var5 = var7.group;
-						if (WorldMapData_0.loadInterface(var5)) {
-							drawModelComponents(UserComparator5.Widget_interfaceComponents[var5], -1);
-						}
-					}
-				}
-
-				if (var3.type == 6) {
-					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) {
-						boolean var4 = Projectile.runCs1(var3);
-						if (var4) {
-							var5 = var3.sequenceId2;
-						} else {
-							var5 = var3.sequenceId;
-						}
-
-						if (var5 != -1) {
-							SequenceDefinition var6 = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var5);
-
-							for (var3.modelFrameCycle += Client.field698; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapSectionType.invalidateWidget(var3)) {
-								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
-								++var3.modelFrame;
-								if (var3.modelFrame >= var6.frameIds.length) {
-									var3.modelFrame -= var6.frameCount;
-									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
-										var3.modelFrame = 0;
-									}
-								}
-							}
-						}
-					}
-
-					if (var3.field2601 != 0 && !var3.isIf3) {
-						int var8 = var3.field2601 >> 16;
-						var5 = var3.field2601 << 16 >> 16;
-						var8 *= Client.field698;
-						var5 *= Client.field698;
-						var3.modelAngleX = var8 + var3.modelAngleX & 2047;
-						var3.modelAngleY = var5 + var3.modelAngleY & 2047;
-						WorldMapSectionType.invalidateWidget(var3);
-					}
-				}
-			}
 		}
 
 	}

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

@@ -4,154 +4,183 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jk")
+@ObfuscatedName("jp")
 @Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lli;"
+		signature = "Lln;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lju;"
+		signature = "Ljv;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 198699637
+		intValue = 1359173587
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2033888675
+		intValue = 1180287539
 	)
-	int field3622;
+	int field3621;
 
 	@ObfuscatedSignature(
-		signature = "(Lli;Lju;)V"
+		signature = "(Lln;Ljv;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3622 = 1;
+		this.field3621 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)Ljh;",
+		signature = "(I)Ljg;",
-		garbageValue = "2"
+		garbageValue = "-706396611"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljh;",
+		signature = "(II)[Ljg;",
-		garbageValue = "951526901"
+		garbageValue = "1510983955"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "969628158"
+		garbageValue = "-1580131719"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = VertexNormal.method2961(var1);
+		long var5 = 0L;
+		int var7 = var1.length();
+
+		for (int var8 = 0; var8 < var7; ++var8) {
+			var5 *= 37L;
+			char var9 = var1.charAt(var8);
+			if (var9 >= 'A' && var9 <= 'Z') {
+				var5 += (long)(var9 + 1 - 65);
+			} else if (var9 >= 'a' && var9 <= 'z') {
+				var5 += (long)(var9 + 1 - 97);
+			} else if (var9 >= '0' && var9 <= '9') {
+				var5 += (long)(var9 + 27 - 48);
+			}
+
+			if (var5 >= 177917621779460413L) {
+				break;
+			}
+		}
+
+		while (0L == var5 % 37L && 0L != var5) {
+			var5 /= 37L;
+		}
+
+		String var10 = WorldMapDecoration.base37DecodeLong(var5);
+		if (var10 == null) {
+			var10 = "";
+		}
+
+		this.name = var10;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-1129044853"
+		garbageValue = "97"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = VertexNormal.method2961(var1);
+		long var5 = 0L;
+		int var7 = var1.length();
+
+		for (int var8 = 0; var8 < var7; ++var8) {
+			var5 *= 37L;
+			char var9 = var1.charAt(var8);
+			if (var9 >= 'A' && var9 <= 'Z') {
+				var5 += (long)(var9 + 1 - 65);
+			} else if (var9 >= 'a' && var9 <= 'z') {
+				var5 += (long)(var9 + 1 - 97);
+			} else if (var9 >= '0' && var9 <= '9') {
+				var5 += (long)(var9 + 27 - 48);
+			}
+
+			if (var5 >= 177917621779460413L) {
+				break;
+			}
+		}
+
+		while (0L == var5 % 37L && var5 != 0L) {
+			var5 /= 37L;
+		}
+
+		String var10 = WorldMapDecoration.base37DecodeLong(var5);
+		if (var10 == null) {
+			var10 = "";
+		}
+
+		this.owner = var10;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("cd")
 	@ObfuscatedSignature(
-		signature = "(Lkl;S)V",
+		signature = "(Lkc;I)V",
-		garbageValue = "20227"
+		garbageValue = "-1009603456"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		long var5 = var2;
+		this.readName(class30.method602(var2));
-		String var4;
-		int var7;
-		if (var2 > 0L && var2 < 6582952005840035281L) {
-			if (var2 % 37L == 0L) {
-				var4 = null;
-			} else {
-				var7 = 0;
-
-				for (long var13 = var2; 0L != var13; var13 /= 37L) {
-					++var7;
-				}
-
-				StringBuilder var15 = new StringBuilder(var7);
-
-				while (0L != var5) {
-					long var11 = var5;
-					var5 /= 37L;
-					var15.append(class288.base37Table[(int)(var11 - 37L * var5)]);
-				}
-
-				var4 = var15.reverse().toString();
-			}
-		} else {
-			var4 = null;
-		}
-
-		this.readName(var4);
 		this.minKick = var1.readByte();
-		var7 = var1.readUnsignedByte();
+		int var4 = var1.readUnsignedByte();
-		if (var7 != 255) {
+		if (var4 != 255) {
 			this.clear();
 
-			for (int var8 = 0; var8 < var7; ++var8) {
+			for (int var5 = 0; var5 < var4; ++var5) {
-				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
+				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
-				int var10 = var1.readUnsignedShort();
+				int var7 = var1.readUnsignedShort();
-				var9.set(var10, ++this.field3622 - 1);
+				var6.set(var7, ++this.field3621 - 1);
-				var9.rank = var1.readByte();
+				var6.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
-				this.isLocalPlayer(var9);
+				this.isLocalPlayer(var6);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("cn")
 	@ObfuscatedSignature(
-		signature = "(Lkl;B)V",
+		signature = "(Lkc;B)V",
-		garbageValue = "-31"
+		garbageValue = "38"
 	)
-	public final void method5166(Buffer var1) {
+	public final void method5354(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -181,7 +210,7 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3622 - 1);
+			var6.set(var3, ++this.field3621 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
@@ -191,7 +220,7 @@ public class ClanChat extends UserList {
 	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "85012014"
+		garbageValue = "2124688840"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -201,10 +230,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("ci")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "313560965"
+		garbageValue = "-1188581699"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -214,10 +243,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cy")
 	@ObfuscatedSignature(
-		signature = "(Ljo;I)V",
+		signature = "(Ljn;I)V",
-		garbageValue = "345857456"
+		garbageValue = "-1306702332"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
@@ -226,4 +255,21 @@ public class ClanChat extends UserList {
 		}
 
 	}
+
+	@ObfuscatedName("a")
+	public static final void method5367(long var0) {
+		if (var0 > 0L) {
+			if (var0 % 10L == 0L) {
+				class43.method882(var0 - 1L);
+
+				try {
+					Thread.sleep(1L);
+				} catch (InterruptedException var3) {
+				}
+			} else {
+				class43.method882(var0);
+			}
+
+		}
+	}
 }

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("jo")
+@ObfuscatedName("jn")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("dj")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "Ljs;"
-	)
-	@Export("archive11")
-	static Archive archive11;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "Ljm;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljs;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -30,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-407939513"
+		garbageValue = "1787297671"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1388018244"
+		garbageValue = "2015099973"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -54,30 +48,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "2101732622"
+		garbageValue = "36"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = Tiles.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = PacketWriter.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "349082109"
+		garbageValue = "-59"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-1700541155"
+		garbageValue = "-8"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -88,22 +82,26 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-735499948"
+		garbageValue = "-1162251482"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = Tiles.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = PacketWriter.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("lx")
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;III)Lkn;",
+		signature = "([BIB)V",
-		garbageValue = "-569680121"
+		garbageValue = "81"
 	)
-	public static Font method4976(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+	static void method5151(byte[] var0, int var1) {
-		return !VertexNormal.method2962(var0, var2, var3) ? null : class49.method893(var1.takeFile(var2, var3));
+		if (Client.randomDatData == null) {
+			Client.randomDatData = new byte[24];
+		}
+
+		class300.writeRandomDat(var0, var1, Client.randomDatData, 0, 24);
 	}
 }

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

@@ -7,45 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bl")
+@ObfuscatedName("bw")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1035730115
+		intValue = 1383703517
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "Lhp;"
-	)
-	@Export("Widget_spritesArchive")
-	static AbstractArchive Widget_spritesArchive;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "Llp;"
-	)
-	static IndexedSprite field1046;
-	@ObfuscatedName("v")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1970428567
+		intValue = 1268365417
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -58,11 +47,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1851(true);
+		this.method1957(true);
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkl;)V"
+		signature = "(Lkc;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -102,26 +91,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1851(true);
+				this.method1957(true);
 			}
 		} else {
-			this.method1851(true);
+			this.method1957(true);
 		}
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(ZI)V",
-		garbageValue = "864937253"
+		garbageValue = "271600309"
 	)
-	void method1851(boolean var1) {
+	void method1957(boolean var1) {
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Lkl;",
+		signature = "(I)Lkc;",
-		garbageValue = "-630561096"
+		garbageValue = "1659906273"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -144,141 +133,13 @@ public class ClientPreferences {
 		return var1;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-70"
+		garbageValue = "1282610090"
 	)
-	static void method1861() {
+	@Export("parseInt")
-		Players.Players_count = 0;
+	public static int parseInt(CharSequence var0) {
-
+		return class192.parseIntCustomRadix(var0, 10, true);
-		for (int var0 = 0; var0 < 2048; ++var0) {
-			Players.field1236[var0] = null;
-			Players.field1235[var0] = 1;
-		}
-
-	}
-
-	@ObfuscatedName("jb")
-	@ObfuscatedSignature(
-		signature = "(Lho;IIII)V",
-		garbageValue = "1173230125"
-	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		WorldMapID.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 = class223.localPlayer.x / 32 + 48;
-				int var7 = 464 - class223.localPlayer.y / 32;
-				ObjectSound.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
-
-				int var8;
-				int var9;
-				int var10;
-				for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
-					var9 = Client.mapIconXs[var8] * 4 + 2 - class223.localPlayer.x / 32;
-					var10 = Client.mapIconYs[var8] * 4 + 2 - class223.localPlayer.y / 32;
-					class208.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4);
-				}
-
-				int var11;
-				int var12;
-				for (var8 = 0; var8 < 104; ++var8) {
-					for (var9 = 0; var9 < 104; ++var9) {
-						NodeDeque var15 = Client.groundItems[WorldMapRectangle.plane][var8][var9];
-						if (var15 != null) {
-							var11 = var8 * 4 + 2 - class223.localPlayer.x / 32;
-							var12 = var9 * 4 + 2 - class223.localPlayer.y / 32;
-							class208.drawSpriteOnMinimap(var1, var2, var11, var12, class13.mapDotSprites[0], var4);
-						}
-					}
-				}
-
-				for (var8 = 0; var8 < Client.npcCount; ++var8) {
-					NPC var16 = Client.npcs[Client.npcIndices[var8]];
-					if (var16 != null && var16.isVisible()) {
-						NPCDefinition var18 = var16.definition;
-						if (var18 != null && var18.transforms != null) {
-							var18 = var18.transform();
-						}
-
-						if (var18 != null && var18.drawMapDot && var18.isInteractable) {
-							var11 = var16.x / 32 - class223.localPlayer.x / 32;
-							var12 = var16.y / 32 - class223.localPlayer.y / 32;
-							class208.drawSpriteOnMinimap(var1, var2, var11, var12, class13.mapDotSprites[1], var4);
-						}
-					}
-				}
-
-				var8 = Players.Players_count;
-				int[] var19 = Players.Players_indices;
-
-				for (var10 = 0; var10 < var8; ++var10) {
-					Player var17 = Client.players[var19[var10]];
-					if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != class223.localPlayer) {
-						var12 = var17.x / 32 - class223.localPlayer.x / 32;
-						int var13 = var17.y / 32 - class223.localPlayer.y / 32;
-						boolean var14 = false;
-						if (class223.localPlayer.team != 0 && var17.team != 0 && var17.team == class223.localPlayer.team) {
-							var14 = true;
-						}
-
-						if (var17.isFriend()) {
-							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[3], var4);
-						} else if (var14) {
-							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[4], var4);
-						} else if (var17.isClanMember()) {
-							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[5], var4);
-						} else {
-							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[2], var4);
-						}
-					}
-				}
-
-				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
-					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
-						NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
-						if (var20 != null) {
-							var11 = var20.x / 32 - class223.localPlayer.x / 32;
-							var12 = var20.y / 32 - class223.localPlayer.y / 32;
-							FloorDecoration.worldToMinimap(var1, var2, var11, var12, GameObject.mapMarkerSprites[1], var4);
-						}
-					}
-
-					if (Client.hintArrowType == 2) {
-						var10 = Client.hintArrowX * 4 - class223.baseX * 256 + 2 - class223.localPlayer.x / 32;
-						var11 = Client.hintArrowY * 4 - class286.baseY * 256 + 2 - class223.localPlayer.y / 32;
-						FloorDecoration.worldToMinimap(var1, var2, var10, var11, GameObject.mapMarkerSprites[1], var4);
-					}
-
-					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
-						Player var21 = Client.players[Client.hintArrowPlayerIndex];
-						if (var21 != null) {
-							var11 = var21.x / 32 - class223.localPlayer.x / 32;
-							var12 = var21.y / 32 - class223.localPlayer.y / 32;
-							FloorDecoration.worldToMinimap(var1, var2, var11, var12, GameObject.mapMarkerSprites[1], var4);
-						}
-					}
-				}
-
-				if (Client.destinationX != 0) {
-					var10 = Client.destinationX * 4 + 2 - class223.localPlayer.x / 32;
-					var11 = Client.destinationY * 4 + 2 - class223.localPlayer.y / 32;
-					class208.drawSpriteOnMinimap(var1, var2, var10, var11, GameObject.mapMarkerSprites[0], var4);
-				}
-
-				if (!class223.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.field842[var3] = true;
-		}
 	}
 }

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

@@ -1,16 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ln")
-@Implements("ClientType")
-public class ClientType
-{
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 2052078695
-	)
-	@Export("clientType")
-	public static int clientType;
-}

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

@@ -4,68 +4,177 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fz")
+@ObfuscatedName("fk")
 @Implements("Clock")
 public abstract class Clock {
-	@ObfuscatedName("qq")
+	@ObfuscatedName("ro")
 	@ObfuscatedGetter(
-		intValue = 1800617984
+		intValue = -578402437
 	)
-	static int field2039;
+	static int field2036;
+	@ObfuscatedName("ly")
+	@ObfuscatedGetter(
+		intValue = -568224545
+	)
+	@Export("selectedSpellWidget")
+	static int selectedSpellWidget;
 
 	Clock() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-54"
+		garbageValue = "1605126906"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(III)I",
-		garbageValue = "569029249"
+		garbageValue = "432238723"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(Lhq;Lhq;Lhq;Lgg;I)Z",
-		garbageValue = "1663360326"
+		garbageValue = "654132136"
 	)
-	@Export("Messages_getLastChatID")
+	public static boolean method3641(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
-	static int Messages_getLastChatID(int var0) {
+		class197.musicPatchesArchive = var0;
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
+		class197.musicSamplesArchive = var1;
-		if (var1 == null) {
+		class197.soundEffectsArchive = var2;
-			return -1;
+		class197.midiPcmStream = var3;
+		return true;
+	}
+
+	@ObfuscatedName("hv")
+	@ObfuscatedSignature(
+		signature = "(ZLkf;I)V",
+		garbageValue = "900111549"
+	)
+	@Export("loadRegions")
+	static final void loadRegions(boolean var0, PacketBuffer var1) {
+		Client.isInInstance = var0;
+		int var2;
+		int var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		if (!Client.isInInstance) {
+			var2 = var1.method5646();
+			int var3 = var1.readUnsignedShort();
+			var4 = var1.readUnsignedShort();
+			ClientPacket.xteaKeys = new int[var4][4];
+
+			for (var5 = 0; var5 < var4; ++var5) {
+				for (var6 = 0; var6 < 4; ++var6) {
+					ClientPacket.xteaKeys[var5][var6] = var1.readInt();
+				}
+			}
+
+			GrandExchangeOfferOwnWorldComparator.regions = new int[var4];
+			class338.regionMapArchiveIds = new int[var4];
+			WorldMapCacheName.regionLandArchiveIds = new int[var4];
+			UrlRequester.regionLandArchives = new byte[var4][];
+			UserComparator3.regionMapArchives = new byte[var4][];
+			boolean var16 = false;
+			if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
+				var16 = true;
+			}
+
+			if (var3 / 8 == 48 && var2 / 8 == 148) {
+				var16 = true;
+			}
+
+			var4 = 0;
+
+			for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) {
+				for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) {
+					var8 = var7 + (var6 << 8);
+					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
+						GrandExchangeOfferOwnWorldComparator.regions[var4] = var8;
+						class338.regionMapArchiveIds[var4] = WorldMapRectangle.archive5.getGroupId("m" + var6 + "_" + var7);
+						WorldMapCacheName.regionLandArchiveIds[var4] = WorldMapRectangle.archive5.getGroupId("l" + var6 + "_" + var7);
+						++var4;
+					}
+				}
+			}
+
+			WorldMapSectionType.method290(var3, var2, true);
 		} else {
-			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
+			var2 = var1.method5648();
+			boolean var15 = var1.method5622() == 1;
+			var4 = var1.method5647();
+			var5 = var1.readUnsignedShort();
+			var1.importIndex();
+
+			int var9;
+			for (var6 = 0; var6 < 4; ++var6) {
+				for (var7 = 0; var7 < 13; ++var7) {
+					for (var8 = 0; var8 < 13; ++var8) {
+						var9 = var1.readBits(1);
+						if (var9 == 1) {
+							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
+						} else {
+							Client.instanceChunkTemplates[var6][var7][var8] = -1;
+						}
+					}
+				}
+			}
+
+			var1.exportIndex();
+			ClientPacket.xteaKeys = new int[var5][4];
+
+			for (var6 = 0; var6 < var5; ++var6) {
+				for (var7 = 0; var7 < 4; ++var7) {
+					ClientPacket.xteaKeys[var6][var7] = var1.readInt();
+				}
+			}
+
+			GrandExchangeOfferOwnWorldComparator.regions = new int[var5];
+			class338.regionMapArchiveIds = new int[var5];
+			WorldMapCacheName.regionLandArchiveIds = new int[var5];
+			UrlRequester.regionLandArchives = new byte[var5][];
+			UserComparator3.regionMapArchives = new byte[var5][];
+			var5 = 0;
+
+			for (var6 = 0; var6 < 4; ++var6) {
+				for (var7 = 0; var7 < 13; ++var7) {
+					for (var8 = 0; var8 < 13; ++var8) {
+						var9 = Client.instanceChunkTemplates[var6][var7][var8];
+						if (var9 != -1) {
+							int var10 = var9 >> 14 & 1023;
+							int var11 = var9 >> 3 & 2047;
+							int var12 = (var10 / 8 << 8) + var11 / 8;
+
+							int var13;
+							for (var13 = 0; var13 < var5; ++var13) {
+								if (GrandExchangeOfferOwnWorldComparator.regions[var13] == var12) {
+									var12 = -1;
+									break;
+								}
+							}
+
+							if (var12 != -1) {
+								GrandExchangeOfferOwnWorldComparator.regions[var5] = var12;
+								var13 = var12 >> 8 & 255;
+								int var14 = var12 & 255;
+								class338.regionMapArchiveIds[var5] = WorldMapRectangle.archive5.getGroupId("m" + var13 + "_" + var14);
+								WorldMapCacheName.regionLandArchiveIds[var5] = WorldMapRectangle.archive5.getGroupId("l" + var13 + "_" + var14);
+								++var5;
+							}
+						}
+					}
+				}
+			}
+
+			WorldMapSectionType.method290(var4, var2, !var15);
 		}
-	}
 
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "(I)I",
-		garbageValue = "1644538233"
-	)
-	static final int method3463() {
-		return ViewportMouse.ViewportMouse_x;
-	}
-
-	@ObfuscatedName("hf")
-	@ObfuscatedSignature(
-		signature = "(IIB)V",
-		garbageValue = "-31"
-	)
-	@Export("resumePauseWidget")
-	static void resumePauseWidget(int var0, int var1) {
-		PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2185, Client.packetWriter.isaacCipher);
-		var2.packetBuffer.writeIntLE16(var0);
-		var2.packetBuffer.writeShort(var1);
-		Client.packetWriter.addNode(var2);
 	}
 }

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

@@ -1,38 +1,39 @@
-import java.awt.Component;
+import java.io.File;
+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("fa")
+@ObfuscatedName("fm")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("ax")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 2078354851
+		intValue = 1716548279
 	)
 	@Export("xInset")
 	int xInset;
-	@ObfuscatedName("as")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -518382829
+		intValue = 100209491
 	)
 	@Export("yInset")
 	int yInset;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = 1308792903
+		intValue = -1893583227
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -888202655
+		intValue = 430347067
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("al")
 	@Export("flags")
 	public int[][] flags;
 
@@ -45,10 +46,10 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "11"
+		garbageValue = "-418924176"
 	)
 	@Export("clear")
 	public void clear() {
@@ -64,12 +65,12 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "1400659630"
+		garbageValue = "-622707761"
 	)
-	public void method3508(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3685(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -216,10 +217,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
+		signature = "(IIIIZS)V",
-		garbageValue = "1277713715"
+		garbageValue = "463"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -243,10 +244,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-691975667"
+		garbageValue = "-712245850"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -256,10 +257,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-119630021"
+		garbageValue = "1787525972"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -269,10 +270,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(IIIB)V",
+		signature = "(IIII)V",
-		garbageValue = "-3"
+		garbageValue = "-1353999324"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -280,12 +281,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "1060838313"
+		garbageValue = "343029197"
 	)
-	public void method3514(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3690(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -432,10 +433,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IIIIIZI)V",
+		signature = "(IIIIIZB)V",
-		garbageValue = "-476929644"
+		garbageValue = "16"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -465,10 +466,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IIIB)V",
+		signature = "(IIII)V",
-		garbageValue = "6"
+		garbageValue = "-840002361"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -476,54 +477,56 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(IIS)V",
-		garbageValue = "-6856"
+		garbageValue = "-31094"
 	)
-	public void method3517(int var1, int var2) {
+	public void method3693(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
 
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(I[BLkg;I)V",
-		garbageValue = "1190241493"
-	)
-	static void method3536(int var0, byte[] var1, ArchiveDisk var2) {
-		ArchiveDiskAction var3 = new ArchiveDiskAction();
-		var3.type = 0;
-		var3.key = (long)var0;
-		var3.data = var1;
-		var3.archiveDisk = var2;
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
-		}
-
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-			if (ArchiveDiskActionHandler.field3127 == 0) {
-				UserComparator5.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-				UserComparator5.ArchiveDiskActionHandler_thread.setDaemon(true);
-				UserComparator5.ArchiveDiskActionHandler_thread.start();
-				UserComparator5.ArchiveDiskActionHandler_thread.setPriority(5);
-			}
-
-			ArchiveDiskActionHandler.field3127 = 600;
-		}
-	}
-
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljava/awt/Component;I)V",
+		signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmh;",
-		garbageValue = "-1662439433"
+		garbageValue = "1385178219"
 	)
-	static void method3544(Component var0) {
+	@Export("getPreferencesFile")
-		var0.removeMouseListener(MouseHandler.MouseHandler_instance);
+	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
-		var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance);
+		File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat");
-		var0.removeFocusListener(MouseHandler.MouseHandler_instance);
+		if (var3.exists()) {
-		MouseHandler.MouseHandler_currentButtonVolatile = 0;
+			try {
+				AccessFile var10 = new AccessFile(var3, "rw", 10000L);
+				return var10;
+			} catch (IOException var9) {
+			}
+		}
+
+		String var4 = "";
+		if (class189.cacheGamebuild == 33) {
+			var4 = "_rc";
+		} else if (class189.cacheGamebuild == 34) {
+			var4 = "_wip";
+		}
+
+		File var5 = new File(class30.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
+		AccessFile var6;
+		if (!var2 && var5.exists()) {
+			try {
+				var6 = new AccessFile(var5, "rw", 10000L);
+				return var6;
+			} catch (IOException var8) {
+			}
+		}
+
+		try {
+			var6 = new AccessFile(var3, "rw", 10000L);
+			return var6;
+		} catch (IOException var7) {
+			throw new RuntimeException();
+		}
 	}
 }

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

@@ -4,30 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hb")
+@ObfuscatedName("hf")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("n")
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Lhq;"
+	)
+	@Export("Widget_archive")
+	static AbstractArchive Widget_archive;
+	@ObfuscatedName("dv")
+	@ObfuscatedSignature(
+		signature = "Lij;"
+	)
+	@Export("archive15")
+	static Archive archive15;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 562826067
+		intValue = 440805047
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2054727359
+		intValue = 649013739
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1032758603
+		intValue = 1217821847
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		signature = "(Lhb;)V"
+		signature = "(Lhf;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -52,20 +64,20 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-444536660"
+		garbageValue = "-1545441296"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lhb;I)Z",
+		signature = "(Lhf;I)Z",
-		garbageValue = "-1914028694"
+		garbageValue = "472807046"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -78,10 +90,10 @@ public class Coord {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-986705762"
+		garbageValue = "-1765692684"
 	)
 	@Export("toString")
 	String toString(String var1) {
@@ -104,35 +116,53 @@ public class Coord {
 		return this.toString(",");
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(IB)Lih;",
+		garbageValue = "-87"
+	)
+	@Export("getEnum")
+	public static EnumDefinition getEnum(int var0) {
+		EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0);
+			var1 = new EnumDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-2118719705"
+		garbageValue = "-1708484762"
 	)
-	@Export("closeWorldSelect")
+	static void method4144() {
-	static void closeWorldSelect() {
+		if (Login.field1188) {
-		Login.worldSelectOpen = false;
+			NPC.titleboxSprite = null;
-		WorldMapID.leftTitleSprite.drawAt(Login.xPadding, 0);
+			UserComparator9.titlebuttonSprite = null;
-		class51.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+			class208.runesSprite = null;
-		FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18);
+			Login.leftTitleSprite = null;
-	}
+			FontName.rightTitleSprite = null;
-
+			Tiles.logoSprite = null;
-	@ObfuscatedName("jm")
+			Decimator.title_muteSprite = null;
-	@ObfuscatedSignature(
+			UserComparator8.options_buttons_0Sprite = null;
-		signature = "(S)V",
+			Login.options_buttons_2Sprite = null;
-		garbageValue = "22280"
+			GrandExchangeEvent.worldSelectBackSprites = null;
-	)
+			JagexCache.worldSelectFlagSprites = null;
-	@Export("FriendSystem_invalidateFriends")
+			StudioGame.worldSelectArrows = null;
-	static final void FriendSystem_invalidateFriends() {
+			Interpreter.worldSelectStars = null;
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
+			Message.field587 = null;
-			Player var1 = Client.players[Players.Players_indices[var0]];
+			Login.loginScreenRunesAnimation.method1955();
-			var1.clearIsFriend();
+			class80.method2194(2);
+			UrlRequester.method3428(true);
+			Login.field1188 = false;
 		}
-
-		KeyHandler.method873();
-		if (Varps.clanChat != null) {
-			Varps.clanChat.clearFriends();
-		}
-
 	}
 }

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

@@ -4,22 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dr")
+@ObfuscatedName("do")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "[Llw;"
+	)
+	@Export("title_muteSprite")
+	static IndexedSprite[] title_muteSprite;
+	@ObfuscatedName("dx")
+	@ObfuscatedSignature(
+		signature = "Lij;"
+	)
+	@Export("archive11")
+	static Archive archive11;
+	@ObfuscatedName("ei")
 	@ObfuscatedGetter(
-		intValue = -222965331
+		intValue = -1888445625
+	)
+	@Export("port2")
+	static int port2;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = -885023939
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 747601715
+		intValue = 929482819
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("table")
 	int[][] table;
 
@@ -47,7 +65,7 @@ public class Decimator {
 			for (int var7 = 0; var7 < var1; ++var7) {
 				int[] var8 = this.table[var7];
 				double var9 = (double)var7 / (double)var1 + 6.0D;
-				int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
+				int var11 = (int)Math.floor(1.0D + (var9 - 7.0D));
 				if (var11 < 0) {
 					var11 = 0;
 				}
@@ -58,24 +76,24 @@ public class Decimator {
 				}
 
 				for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
-					double var15 = 3.141592653589793D * ((double)var11 - var9);
+					double var15 = ((double)var11 - var9) * 3.141592653589793D;
 					double var17 = var13;
 					if (var15 < -1.0E-4D || var15 > 1.0E-4D) {
 						var17 = var13 * (Math.sin(var15) / var15);
 					}
 
-					var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
+					var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9));
-					var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D);
+					var8[var11] = (int)Math.floor(0.5D + 65536.0D * var17);
 				}
 			}
 
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "([BI)[B",
-		garbageValue = "906746870"
+		garbageValue = "73782280"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
@@ -92,7 +110,7 @@ public class Decimator {
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var4 + var9] += var7 * var8[var9];
+					var3[var4 + var9] += var8[var9] * var7;
 				}
 
 				var5 += this.outputRate;
@@ -118,10 +136,10 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IB)I",
-		garbageValue = "1984702959"
+		garbageValue = "30"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
@@ -132,104 +150,102 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IB)I",
-		garbageValue = "-1527580857"
+		garbageValue = "13"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6;
+			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
 		}
 
 		return var1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)Lij;",
+		signature = "(II)Liz;",
-		garbageValue = "-1096040565"
+		garbageValue = "1437628659"
 	)
-	@Export("WorldMapElement_get")
+	public static VarcInt method2694(int var0) {
-	public static WorldMapElement WorldMapElement_get(int var0) {
+		VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0);
-		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0);
+		if (var1 != null) {
-	}
+			return var1;
-
-	@ObfuscatedName("ei")
-	@ObfuscatedSignature(
-		signature = "(I)Lla;",
-		garbageValue = "-695758013"
-	)
-	@Export("getWorldMap")
-	static WorldMap getWorldMap() {
-		return Tiles.worldMap;
-	}
-
-	@ObfuscatedName("hz")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "851552801"
-	)
-	static final void method2500() {
-		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.field758[++Client.field640 - 1] = Client.npcIndices[var2];
-			}
-		}
-
-		if (var1 > Client.npcCount) {
-			throw new RuntimeException("");
 		} else {
-			Client.npcCount = 0;
+			byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0);
-
+			var1 = new VarcInt();
-			for (var2 = 0; var2 < var1; ++var2) {
+			if (var2 != null) {
-				int var3 = Client.npcIndices[var2];
+				var1.method4549(new Buffer(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.field681[++Client.field633 - 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.method2048(var7, (byte)1);
-							var8 = var0.readBits(1);
-							if (var8 == 1) {
-								Client.field681[++Client.field633 - 1] = var3;
-							}
-						} else if (var6 == 2) {
-							Client.npcIndices[++Client.npcCount - 1] = var3;
-							var4.npcCycle = Client.cycle;
-							var7 = var0.readBits(3);
-							var4.method2048(var7, (byte)2);
-							var8 = var0.readBits(3);
-							var4.method2048(var8, (byte)2);
-							int var9 = var0.readBits(1);
-							if (var9 == 1) {
-								Client.field681[++Client.field633 - 1] = var3;
-							}
-						} else if (var6 == 3) {
-							Client.field758[++Client.field640 - 1] = var3;
-						}
-					}
-				}
 			}
 
+			VarcInt.VarcInt_cached.put(var1, (long)var0);
+			return var1;
 		}
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/Object;ZI)[B",
+		garbageValue = "1813906686"
+	)
+	@Export("serialize")
+	public static byte[] serialize(Object var0, boolean var1) {
+		if (var0 == null) {
+			return null;
+		} else if (var0 instanceof byte[]) {
+			byte[] var3 = (byte[])((byte[])var0);
+			return var1 ? Message.method1312(var3) : var3;
+		} else if (var0 instanceof AbstractByteArrayCopier) {
+			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
+			return var2.get();
+		} else {
+			throw new IllegalArgumentException();
+		}
+	}
+
+	@ObfuscatedName("im")
+	@ObfuscatedSignature(
+		signature = "(III)V",
+		garbageValue = "-962309215"
+	)
+	@Export("calculateMenuBounds")
+	static void calculateMenuBounds(int var0, int var1) {
+		int var2 = class43.fontBold12.stringWidth("Choose Option");
+
+		int var3;
+		int var4;
+		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) {
+			var4 = class43.fontBold12.stringWidth(class65.method1316(var3));
+			if (var4 > var2) {
+				var2 = var4;
+			}
+		}
+
+		var2 += 8;
+		var3 = Client.menuOptionsCount * 15 + 22;
+		var4 = var0 - var2 / 2;
+		if (var2 + var4 > class286.canvasWidth) {
+			var4 = class286.canvasWidth - var2;
+		}
+
+		if (var4 < 0) {
+			var4 = 0;
+		}
+
+		int var5 = var1;
+		if (var1 + var3 > FloorUnderlayDefinition.canvasHeight) {
+			var5 = FloorUnderlayDefinition.canvasHeight - var3;
+		}
+
+		if (var5 < 0) {
+			var5 = 0;
+		}
+
+		MusicPatchNode.menuX = var4;
+		TextureProvider.menuY = var5;
+		KeyHandler.menuWidth = var2;
+		WorldMapData_1.menuHeight = Client.menuOptionsCount * 15 + 22;
+	}
 }

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

@@ -4,23 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kp")
+@ObfuscatedName("km")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lkp;"
+		signature = "Lkm;"
 	)
-	static final DefaultsGroup field3794;
+	static final DefaultsGroup field3785;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 779550305
+		intValue = 1787952601
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3794 = new DefaultsGroup(3);
+		field3785 = 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("eu")
+@ObfuscatedName("ed")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llr;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lji;"
+		signature = "Ljq;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lev;"
+		signature = "Les;"
 	)
-	class146 field1944;
+	class146 field1943;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,7 +42,7 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -73,16 +73,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lec;)V"
+		signature = "(Leo;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -94,7 +94,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
@@ -113,8 +113,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5);
-				if (this.field1944 != null) {
+				if (this.field1943 != null) {
-					this.field1944.method3302(var5.get());
+					this.field1943.method3453(var5.get());
 				}
 			}
 
@@ -125,7 +125,7 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
@@ -146,7 +146,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

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

@@ -5,41 +5,44 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lv")
+@ObfuscatedName("lf")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("bx")
+	@ObfuscatedName("eg")
-	@Export("otp")
+	@ObfuscatedSignature(
-	static String otp;
+		signature = "Lij;"
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = -1774295629
 	)
-	int field3898;
+	@Export("archive17")
-	@ObfuscatedName("r")
+	static Archive archive17;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1935188169
+		intValue = -1279916099
+	)
+	int field3895;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1801255819
+	)
+	int field3896;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 10853499
 	)
 	int field3899;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 271278755
-	)
-	int field3900;
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Llt;",
+		signature = "(I)Llk;",
-		garbageValue = "2006662723"
+		garbageValue = "-1540970685"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (class162.field1990.startsWith("win")) {
+		if (class96.field1299.startsWith("win")) {
 			var1 = 1;
-		} else if (class162.field1990.startsWith("mac")) {
+		} else if (class96.field1299.startsWith("mac")) {
 			var1 = 2;
-		} else if (class162.field1990.startsWith("linux")) {
+		} else if (class96.field1299.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -137,11 +140,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6239(var5);
+		this.method6392(var5);
 		Runtime.getRuntime();
 		int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
 		int var11;
-		if (this.field3898 > 3) {
+		if (this.field3895 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -155,53 +158,53 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3898, this.field3899, this.field3900, 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.field3895, this.field3896, this.field3899, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;S)V",
-		garbageValue = "-611564637"
+		garbageValue = "4097"
 	)
-	void method6239(String var1) {
+	void method6392(String var1) {
 		if (var1.startsWith("1.")) {
-			this.method6232(var1);
+			this.method6390(var1);
 		} else {
-			this.method6233(var1);
+			this.method6395(var1);
 		}
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "1764264863"
+		garbageValue = "4"
 	)
-	void method6232(String var1) {
+	void method6390(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
-			this.field3898 = Integer.parseInt(var2[1]);
+			this.field3895 = Integer.parseInt(var2[1]);
 			var2 = var2[2].split("_");
-			this.field3899 = Integer.parseInt(var2[0]);
+			this.field3896 = Integer.parseInt(var2[0]);
-			this.field3900 = Integer.parseInt(var2[1]);
+			this.field3899 = Integer.parseInt(var2[1]);
 		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-775775529"
+		garbageValue = "1"
 	)
-	void method6233(String var1) {
+	void method6395(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
-			this.field3898 = Integer.parseInt(var2[0]);
+			this.field3895 = Integer.parseInt(var2[0]);
-			this.field3899 = Integer.parseInt(var2[1]);
+			this.field3896 = Integer.parseInt(var2[1]);
-			this.field3900 = Integer.parseInt(var2[2]);
+			this.field3899 = Integer.parseInt(var2[2]);
 		} catch (Exception var4) {
 		}
 

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

@@ -9,61 +9,62 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("af")
+@ObfuscatedName("at")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -66296385
+		intValue = 1308062251
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "8"
+		garbageValue = "-122"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)UrlRequest.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)(PcmPlayer.PcmPlayer_sampleRate * 22050), 16, InterfaceParent.PcmPlayer_stereo ? 2 : 1, true, false);
-		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
+		this.byteSamples = new byte[256 << (InterfaceParent.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IS)V",
+		signature = "(II)V",
-		garbageValue = "2148"
+		garbageValue = "1329305761"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
 		try {
-			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
+			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (InterfaceParent.PcmPlayer_stereo ? 2 : 1));
 			this.line = (SourceDataLine)AudioSystem.getLine(var2);
 			this.line.open();
 			this.line.start();
 			this.capacity2 = var1;
 		} catch (LineUnavailableException var5) {
-			int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
+			if (GraphicsObject.method2158(var1) != 1) {
-			var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
+				int var4 = var1 - 1;
-			var4 = (var4 >>> 4) + var4 & 252645135;
+				var4 |= var4 >>> 1;
-			var4 += var4 >>> 8;
+				var4 |= var4 >>> 2;
-			var4 += var4 >>> 16;
+				var4 |= var4 >>> 4;
-			int var3 = var4 & 255;
+				var4 |= var4 >>> 8;
-			if (var3 != 1) {
+				var4 |= var4 >>> 16;
-				this.open(Timer.method4935(var1));
+				int var3 = var4 + 1;
+				this.open(var3);
 			} else {
 				this.line = null;
 				throw var5;
@@ -71,21 +72,21 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "1"
+		garbageValue = "-2053382901"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
+		return this.capacity2 - (this.line.available() >> (InterfaceParent.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
-		if (PcmPlayer.PcmPlayer_stereo) {
+		if (InterfaceParent.PcmPlayer_stereo) {
 			var1 <<= 1;
 		}
 
@@ -102,10 +103,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "90832052"
+		garbageValue = "-359946727"
 	)
 	@Export("close")
 	protected void close() {
@@ -116,10 +117,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1875138754"
+		garbageValue = "47548316"
 	)
 	@Export("discard")
 	protected void discard() {

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

@@ -1,97 +1,316 @@
 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("ag")
+@ObfuscatedName("az")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements PcmPlayerProvider {
+public class DevicePcmPlayerProvider implements class99 {
-	@ObfuscatedName("sg")
+	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 408059263
-	)
-	@Export("foundItemIdCount")
-	static int foundItemIdCount;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1430118873
-	)
-	@Export("KitDefinition_fileCount")
-	public static int KitDefinition_fileCount;
-	@ObfuscatedName("p")
-	static byte[][][] field393;
-	@ObfuscatedName("y")
-	static int[][] field386;
-	@ObfuscatedName("i")
-	public static short[][] field390;
-	@ObfuscatedName("ja")
 	@ObfuscatedSignature(
-		signature = "Lho;"
+		signature = "Lhq;"
 	)
-	static Widget field391;
+	@Export("SequenceDefinition_animationsArchive")
-	@ObfuscatedName("lk")
+	static AbstractArchive SequenceDefinition_animationsArchive;
-	@ObfuscatedGetter(
+	@ObfuscatedName("co")
-		intValue = -783171563
+	public static char field395;
-	)
-	@Export("selectedItemSlot")
-	static int selectedItemSlot;
 
 	DevicePcmPlayerProvider() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Ldv;",
+		signature = "(I)Ldq;",
-		garbageValue = "-79742550"
+		garbageValue = "1807765023"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}
 
-	@ObfuscatedName("im")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IIIIIII)V",
+		signature = "(Lkf;I)V",
-		garbageValue = "405770761"
+		garbageValue = "-1072829390"
 	)
-	static final void method877(int var0, int var1, int var2, int var3, int var4, int var5) {
+	static final void method919(PacketBuffer var0) {
-		int var6 = var2 - var0;
+		int var1 = 0;
-		int var7 = var3 - var1;
+		var0.importIndex();
-		int var8 = var6 >= 0 ? var6 : -var6;
+
-		int var9 = var7 >= 0 ? var7 : -var7;
+		byte[] var10000;
-		int var10 = var8;
+		int var2;
-		if (var8 < var9) {
+		int var3;
-			var10 = var9;
+		int var4;
+		for (var2 = 0; var2 < Players.Players_count; ++var2) {
+			var3 = Players.Players_indices[var2];
+			if ((Players.field1227[var3] & 1) == 0) {
+				if (var1 > 0) {
+					--var1;
+					var10000 = Players.field1227;
+					var10000[var3] = (byte)(var10000[var3] | 2);
+				} else {
+					var4 = var0.readBits(1);
+					if (var4 == 0) {
+						var1 = class81.method2206(var0);
+						var10000 = Players.field1227;
+						var10000[var3] = (byte)(var10000[var3] | 2);
+					} else {
+						ClientPacket.readPlayerUpdate(var0, var3);
+					}
+				}
+			}
 		}
 
-		if (var10 != 0) {
+		var0.exportIndex();
-			int var11 = (var6 << 16) / var10;
+		if (var1 != 0) {
-			int var12 = (var7 << 16) / var10;
+			throw new RuntimeException();
-			if (var12 <= var11) {
+		} else {
-				var11 = -var11;
+			var0.importIndex();
-			} else {
+
-				var12 = -var12;
+			for (var2 = 0; var2 < Players.Players_count; ++var2) {
+				var3 = Players.Players_indices[var2];
+				if ((Players.field1227[var3] & 1) != 0) {
+					if (var1 > 0) {
+						--var1;
+						var10000 = Players.field1227;
+						var10000[var3] = (byte)(var10000[var3] | 2);
+					} else {
+						var4 = var0.readBits(1);
+						if (var4 == 0) {
+							var1 = class81.method2206(var0);
+							var10000 = Players.field1227;
+							var10000[var3] = (byte)(var10000[var3] | 2);
+						} else {
+							ClientPacket.readPlayerUpdate(var0, var3);
+						}
+					}
+				}
 			}
 
-			int var13 = var5 * var12 >> 17;
+			var0.exportIndex();
-			int var14 = var5 * var12 + 1 >> 17;
+			if (var1 != 0) {
-			int var15 = var5 * var11 >> 17;
+				throw new RuntimeException();
-			int var16 = var5 * var11 + 1 >> 17;
+			} else {
-			var0 -= Rasterizer2D.Rasterizer2D_xClipStart;
+				var0.importIndex();
-			var1 -= Rasterizer2D.Rasterizer2D_yClipStart;
+
-			int var17 = var0 + var13;
+				for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
-			int var18 = var0 - var14;
+					var3 = Players.Players_emptyIndices[var2];
-			int var19 = var0 + var6 - var14;
+					if ((Players.field1227[var3] & 1) != 0) {
-			int var20 = var0 + var13 + var6;
+						if (var1 > 0) {
-			int var21 = var15 + var1;
+							--var1;
-			int var22 = var1 - var16;
+							var10000 = Players.field1227;
-			int var23 = var7 + var1 - var16;
+							var10000[var3] = (byte)(var10000[var3] | 2);
-			int var24 = var15 + var7 + var1;
+						} else {
-			Rasterizer3D.method2972(var17, var18, var19);
+							var4 = var0.readBits(1);
-			Rasterizer3D.method2975(var21, var22, var23, var17, var18, var19, var4);
+							if (var4 == 0) {
-			Rasterizer3D.method2972(var17, var19, var20);
+								var1 = class81.method2206(var0);
-			Rasterizer3D.method2975(var21, var23, var24, var17, var19, var20, var4);
+								var10000 = Players.field1227;
+								var10000[var3] = (byte)(var10000[var3] | 2);
+							} else if (class247.updateExternalPlayer(var0, var3)) {
+								var10000 = Players.field1227;
+								var10000[var3] = (byte)(var10000[var3] | 2);
+							}
+						}
+					}
+				}
+
+				var0.exportIndex();
+				if (var1 != 0) {
+					throw new RuntimeException();
+				} else {
+					var0.importIndex();
+
+					for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
+						var3 = Players.Players_emptyIndices[var2];
+						if ((Players.field1227[var3] & 1) == 0) {
+							if (var1 > 0) {
+								--var1;
+								var10000 = Players.field1227;
+								var10000[var3] = (byte)(var10000[var3] | 2);
+							} else {
+								var4 = var0.readBits(1);
+								if (var4 == 0) {
+									var1 = class81.method2206(var0);
+									var10000 = Players.field1227;
+									var10000[var3] = (byte)(var10000[var3] | 2);
+								} else if (class247.updateExternalPlayer(var0, var3)) {
+									var10000 = Players.field1227;
+									var10000[var3] = (byte)(var10000[var3] | 2);
+								}
+							}
+						}
+					}
+
+					var0.exportIndex();
+					if (var1 != 0) {
+						throw new RuntimeException();
+					} else {
+						Players.Players_count = 0;
+						Players.Players_emptyIdxCount = 0;
+
+						for (var2 = 1; var2 < 2048; ++var2) {
+							var10000 = Players.field1227;
+							var10000[var2] = (byte)(var10000[var2] >> 1);
+							Player var5 = Client.players[var2];
+							if (var5 != null) {
+								Players.Players_indices[++Players.Players_count - 1] = var2;
+							} else {
+								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2;
+							}
+						}
+
+					}
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(IIS)I",
+		garbageValue = "6602"
+	)
+	static final int method918(int var0, int var1) {
+		int var2 = var0 + var1 * 57;
+		var2 ^= var2 << 13;
+		int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE;
+		return var3 >> 19 & 255;
+	}
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		signature = "(ILcj;ZI)I",
+		garbageValue = "1874090730"
+	)
+	static int method916(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] = class3.method68(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] = WorldMapAreaData.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] = Canvas.method935(var3, var4);
+				return 1;
+			} else if (var0 == ScriptOpcodes.INV_SIZE) {
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.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 = Player.Scene_plane;
+					var4 = UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7);
+					var5 = HealthBar.baseY * 64 + (class215.localPlayer.y >> 7);
+					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] = class3.method68(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] = WorldMapAreaData.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] = Canvas.method935(var3, var4);
+					return 1;
+				} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) {
+					if (Client.staffModLevel >= 2) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.REBOOTTIMER) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer;
+					return 1;
+				} else if (var0 == ScriptOpcodes.MAP_WORLD) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId;
+					return 1;
+				} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy;
+					return 1;
+				} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight;
+					return 1;
+				} else if (var0 == ScriptOpcodes.PLAYERMOD) {
+					if (Client.playerMod) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.WORLDFLAGS) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties;
+					return 1;
+				} else if (var0 == ScriptOpcodes.MOVECOORD) {
+					Interpreter.Interpreter_intStackSize -= 4;
+					var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+					var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+					int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
+					var3 += var4 << 14;
+					var3 += var5 << 28;
+					var3 += var6;
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3;
+					return 1;
+				} else {
+					return 2;
+				}
+			}
 		}
 	}
 }

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

@@ -1,29 +1,28 @@
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gj")
+@ObfuscatedName("gv")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("l")
+	@ObfuscatedName("jz")
-	@Export("BZip2Decompressor_block")
+	@ObfuscatedSignature(
-	static int[] BZip2Decompressor_block;
+		signature = "Lhi;"
-	@ObfuscatedName("eu")
+	)
-	static int[] field2482;
+	static Widget field2476;
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
 	DirectByteArrayCopier() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(B)[B",
-		garbageValue = "-37"
+		garbageValue = "19"
 	)
 	@Export("get")
 	byte[] get() {
@@ -33,10 +32,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BB)V",
-		garbageValue = "-793496359"
+		garbageValue = "-93"
 	)
 	@Export("set")
 	void set(byte[] var1) {
@@ -45,28 +44,59 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		this.directBuffer.put(var1);
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
+		signature = "(B)V",
-		garbageValue = "-2052817052"
+		garbageValue = "102"
 	)
-	public static void method3924(boolean var0) {
+	public static void method4101() {
-		if (NetCache.NetCache_socket != null) {
+		PlayerAppearance.PlayerAppearance_cachedModels.clear();
-			try {
+	}
-				Buffer var1 = new Buffer(4);
+
-				var1.writeByte(var0 ? 2 : 3);
+	@ObfuscatedName("kv")
-				var1.writeMedium(0);
+	@ObfuscatedSignature(
-				NetCache.NetCache_socket.write(var1.array, 0, 4);
+		signature = "([Lhi;IB)V",
-			} catch (IOException var4) {
+		garbageValue = "126"
-				try {
+	)
-					NetCache.NetCache_socket.close();
+	@Export("runComponentCloseListeners")
-				} catch (Exception var3) {
+	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) {
+						AttackOption.runIntfCloseListeners(var4.group, var1);
+					}
 				}
 
-				++NetCache.NetCache_ioExceptions;
+				ScriptEvent var5;
-				NetCache.NetCache_socket = null;
+				if (var1 == 0 && var3.onDialogAbort != null) {
-			}
+					var5 = new ScriptEvent();
+					var5.widget = var3;
+					var5.args = var3.onDialogAbort;
+					GrandExchangeOfferAgeComparator.runScriptEvent(var5);
+				}
 
+				if (var1 == 1 && var3.onSubChange != null) {
+					if (var3.childIndex >= 0) {
+						Widget var6 = PacketBufferNode.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;
+					GrandExchangeOfferAgeComparator.runScriptEvent(var5);
+				}
+			}
 		}
+
 	}
 }

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("ez")
+@ObfuscatedName("en")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@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("fw")
+@ObfuscatedName("fa")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cu")
+	@ObfuscatedName("cj")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cm")
 	@ObfuscatedSignature(
-		signature = "Lfw;"
+		signature = "Lfa;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cc")
+	@ObfuscatedName("cb")
 	@ObfuscatedSignature(
-		signature = "Lfw;"
+		signature = "Lfa;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cu")
 	@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("ic")
+@ObfuscatedName("ia")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lfw;"
+		signature = "Lfa;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lfw;)V"
+		signature = "(Lfa;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lfw;)V"
+		signature = "(Lfa;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "()Lfw;"
+		signature = "()Lfa;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ce")
+@ObfuscatedName("cm")
 @Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1757320161
+		intValue = 555172431
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 270171291
+		intValue = 1782600615
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1684018413
+		intValue = 984708177
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -804761033
+		intValue = -1991906229
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1414323503
+		intValue = -2040349825
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1753767283
+		intValue = 1510224555
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lix;"
+		signature = "Liv;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1311165823
+		intValue = 1143115641
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 972994897
+		intValue = -1689348079
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLer;)V"
+		signature = "(IIIIIIIZLep;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -73,12 +73,12 @@ public class DynamicObject extends Entity {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var7);
+			this.sequenceDefinition = PlayerType.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field3517 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field3521 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
-				if (var10.sequenceDefinition == this.sequenceDefinition) {
+				if (this.sequenceDefinition == var10.sequenceDefinition) {
 					this.frame = var10.frame;
 					this.cycleStart = var10.cycleStart;
 					return;
@@ -93,10 +93,10 @@ public class DynamicObject extends Entity {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Ldh;",
+		signature = "(B)Ldv;",
-		garbageValue = "-62237472"
+		garbageValue = "-40"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -106,11 +106,11 @@ public class DynamicObject extends Entity {
 				var1 = 100;
 			}
 
-			label56: {
+			label55: {
 				do {
 					do {
 						if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-							break label56;
+							break label55;
 						}
 
 						var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -126,7 +126,7 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectDefinition var12 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(this.id);
+		ObjectDefinition var12 = WorldMapDecorationType.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -149,116 +149,10 @@ public class DynamicObject extends Entity {
 			int var6 = (var3 >> 1) + this.y;
 			int var7 = (var3 + 1 >> 1) + this.y;
 			int[][] var8 = Tiles.Tiles_heights[this.plane];
-			int var9 = var8[var5][var6] + var8[var4][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
+			int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][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("u")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "1880284014"
-	)
-	@Export("isKeyDown")
-	public static final boolean isKeyDown() {
-		synchronized(KeyHandler.KeyHandler_instance) {
-			if (KeyHandler.field380 == KeyHandler.field378) {
-				return false;
-			} else {
-				SecureRandomFuture.field1230 = KeyHandler.field375[KeyHandler.field378];
-				KeyHandler.field381 = KeyHandler.field374[KeyHandler.field378];
-				KeyHandler.field378 = KeyHandler.field378 + 1 & 127;
-				return true;
-			}
-		}
-	}
-
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		signature = "(Ldc;I)V",
-		garbageValue = "1888530585"
-	)
-	@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("ea")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "274251023"
-	)
-	@Export("logOut")
-	static final void logOut() {
-		Client.packetWriter.close();
-		WorldMapIcon_1.method314();
-		PacketWriter.scene.clear();
-
-		for (int var0 = 0; var0 < 4; ++var0) {
-			Client.collisionMaps[var0].clear();
-		}
-
-		System.gc();
-		class197.field2386 = 1;
-		class197.musicTrackArchive = null;
-		class188.musicTrackGroupId = -1;
-		class49.musicTrackFileId = -1;
-		TileItem.field1223 = 0;
-		WorldMapSectionType.musicTrackBoolean = false;
-		MusicPatchNode2.field2382 = 2;
-		Client.field666 = -1;
-		Client.field759 = false;
-		ClientPacket.method3581();
-		MouseRecorder.updateGameState(10);
-	}
-
-	@ObfuscatedName("gn")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "652940971"
-	)
-	static final void method2225() {
-		for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) {
-			if (var0.plane == WorldMapRectangle.plane && Client.cycle <= var0.cycleEnd) {
-				if (Client.cycle >= var0.cycleStart) {
-					if (var0.targetIndex > 0) {
-						NPC var1 = Client.npcs[var0.targetIndex - 1];
-						if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) {
-							var0.setDestination(var1.x, var1.y, MusicPatchPcmStream.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle);
-						}
-					}
-
-					if (var0.targetIndex < 0) {
-						int var2 = -var0.targetIndex - 1;
-						Player var3;
-						if (var2 == Client.localPlayerIndex) {
-							var3 = class223.localPlayer;
-						} else {
-							var3 = Client.players[var2];
-						}
-
-						if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) {
-							var0.setDestination(var3.x, var3.y, MusicPatchPcmStream.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle);
-						}
-					}
-
-					var0.advance(Client.field698);
-					PacketWriter.scene.drawEntity(WorldMapRectangle.plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false);
-				}
-			} else {
-				var0.remove();
-			}
-		}
-
-	}
 }

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

@@ -1,17 +1,21 @@
-import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("er")
+@ObfuscatedName("ep")
 @Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("ci")
+	@ObfuscatedName("dl")
+	@ObfuscatedSignature(
+		signature = "Lfw;"
+	)
+	@Export("js5SocketTask")
+	static Task js5SocketTask;
+	@ObfuscatedName("cq")
 	@ObfuscatedGetter(
-		intValue = -2145101269
+		intValue = 1761306051
 	)
 	@Export("height")
 	public int height;
@@ -20,17 +24,17 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Ldh;",
+		signature = "(B)Ldv;",
-		garbageValue = "-62237472"
+		garbageValue = "-40"
 	)
 	@Export("getModel")
 	protected Model getModel() {
 		return null;
 	}
 
-	@ObfuscatedName("cb")
+	@ObfuscatedName("ci")
 	@Export("draw")
 	void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
 		Model var11 = this.getModel();
@@ -41,185 +45,54 @@ public abstract class Entity extends DualNode {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(CB)B",
+		signature = "([BILjava/lang/CharSequence;I)I",
-		garbageValue = "92"
+		garbageValue = "-1230334360"
 	)
-	@Export("charToByteCp1252")
+	public static int method3390(byte[] var0, int var1, CharSequence var2) {
-	public static byte charToByteCp1252(char var0) {
+		int var3 = var2.length();
-		byte var1;
+		int var4 = 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;
+		for (int var5 = 0; var5 < var3; ++var5) {
-	}
+			char var6 = var2.charAt(var5);
-
+			if (var6 <= 127) {
-	@ObfuscatedName("i")
+				var0[var4++] = (byte)var6;
-	@ObfuscatedSignature(
+			} else if (var6 <= 2047) {
-		signature = "(I)Ljava/lang/String;",
+				var0[var4++] = (byte)(192 | var6 >> 6);
-		garbageValue = "67381036"
+				var0[var4++] = (byte)(128 | var6 & '?');
-	)
-	static String method3225() {
-		String var0 = "";
-
-		Message var2;
-		for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') {
-			var2 = (Message)var1.next();
-		}
-
-		return var0;
-	}
-
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
-		garbageValue = "160012965"
-	)
-	static int method3216(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			Client.field880 = (short)PlayerAppearance.method3978(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]);
-			if (Client.field880 <= 0) {
-				Client.field880 = 256;
-			}
-
-			Client.field887 = (short)PlayerAppearance.method3978(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-			if (Client.field887 <= 0) {
-				Client.field887 = 256;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			if (Client.zoomHeight <= 0) {
-				Client.zoomHeight = 256;
-			}
-
-			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (Client.zoomWidth <= 0) {
-				Client.zoomWidth = 320;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
-			Interpreter.Interpreter_intStackSize -= 4;
-			Client.field686 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			if (Client.field686 <= 0) {
-				Client.field686 = 1;
-			}
-
-			Client.field891 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (Client.field891 <= 0) {
-				Client.field891 = 32767;
-			} else if (Client.field891 < Client.field686) {
-				Client.field891 = Client.field686;
-			}
-
-			Client.field892 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-			if (Client.field892 <= 0) {
-				Client.field892 = 1;
-			}
-
-			Client.field893 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
-			if (Client.field893 <= 0) {
-				Client.field893 = 32767;
-			} else if (Client.field893 < Client.field892) {
-				Client.field893 = Client.field892;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
-			if (Client.viewportWidget != null) {
-				AbstractByteArrayCopier.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth;
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight;
 			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+				var0[var4++] = (byte)(224 | var6 >> '\f');
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+				var0[var4++] = (byte)(128 | var6 >> 6 & 63);
+				var0[var4++] = (byte)(128 | var6 & '?');
 			}
+		}
 
-			return 1;
+		return var4 - var1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
+	}
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight;
+
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth;
+	@ObfuscatedName("hh")
-			return 1;
+	@ObfuscatedSignature(
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
+		signature = "(Lbz;II)V",
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4081(Client.field880);
+		garbageValue = "781315687"
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4081(Client.field887);
+	)
-			return 1;
+	@Export("getActorScreenLocation")
-		} else if (var0 == 6220) {
+	static final void getActorScreenLocation(Actor var0, int var1) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+		WorldMapCacheName.worldToScreen(var0.x, var0.y, var1);
-			return 1;
+	}
-		} else if (var0 == 6221) {
+
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+	@ObfuscatedName("la")
-			return 1;
+	@ObfuscatedSignature(
-		} else if (var0 == 6222) {
+		signature = "(Ljava/lang/String;B)V",
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.canvasWidth;
+		garbageValue = "-43"
-			return 1;
+	)
-		} else if (var0 == 6223) {
+	@Export("Clan_joinChat")
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.canvasHeight;
+	static final void Clan_joinChat(String var0) {
-			return 1;
+		if (!var0.equals("")) {
-		} else {
+			PacketBufferNode var1 = SoundSystem.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher);
-			return 2;
+			var1.packetBuffer.writeByte(UserComparator6.stringCp1252NullTerminatedByteSize(var0));
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+			Client.packetWriter.addNode(var1);
 		}
 	}
 }

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

@@ -4,55 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ia")
+@ObfuscatedName("ih")
 @Implements("EnumDefinition")
 public class EnumDefinition extends DualNode {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("EnumDefinition_archive")
-	public static AbstractArchive EnumDefinition_archive;
+	static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "Laq;"
-	)
-	@Export("worldMapEvent")
-	static WorldMapEvent worldMapEvent;
-	@ObfuscatedName("v")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 213418595
+		intValue = -308571373
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1372083607
+		intValue = 1084759985
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -67,8 +61,8 @@ public class EnumDefinition extends DualNode {
 
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkl;I)V",
+		signature = "(Lkc;S)V",
-		garbageValue = "-1933011246"
+		garbageValue = "-15054"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -82,10 +76,10 @@ public class EnumDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkl;II)V",
+		signature = "(Lkc;II)V",
-		garbageValue = "1574226398"
+		garbageValue = "1118644647"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -122,22 +116,40 @@ public class EnumDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1423753567"
+		garbageValue = "-1832582259"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(IIII)I",
-		garbageValue = "54"
+		garbageValue = "-1010207116"
 	)
-	static final void method4508(String var0) {
+	@Export("hslToRgb")
-		class210.addGameMessage(30, "", var0);
+	static final int hslToRgb(int var0, int var1, int var2) {
+		if (var2 > 179) {
+			var1 /= 2;
+		}
+
+		if (var2 > 192) {
+			var1 /= 2;
+		}
+
+		if (var2 > 217) {
+			var1 /= 2;
+		}
+
+		if (var2 > 243) {
+			var1 /= 2;
+		}
+
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
+		return var3;
 	}
 }

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

@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ga")
+@ObfuscatedName("gy")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(S)I",
+		signature = "(I)I",
-		garbageValue = "221"
+		garbageValue = "-1993081102"
 	)
 	@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("em")
+@ObfuscatedName("eb")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lfw;"
+		signature = "Lfa;"
 	)
-	DualNode field1937;
+	DualNode field1936;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llr;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lji;"
+		signature = "Ljq;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field1937 = new DualNode();
+		this.field1936 = 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("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(J)Lfw;"
+		signature = "(J)Lfa;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@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("n")
 	@ObfuscatedSignature(
-		signature = "(Lfw;J)V"
+		signature = "(Lfa;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.field1937) {
+			if (var4 == this.field1936) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1937 = new DualNode();
+		this.field1936 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

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

@@ -4,42 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ee")
+@ObfuscatedName("eq")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("o")
+	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "Lkn;"
-	)
-	@Export("ItemDefinition_fontPlain11")
-	static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "Lkl;"
-	)
-	@Export("NetCache_responseArchiveBuffer")
-	static Buffer NetCache_responseArchiveBuffer;
-	@ObfuscatedName("ds")
-	@ObfuscatedSignature(
-		signature = "Lie;"
-	)
-	@Export("archive2")
-	static Archive archive2;
-	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 149051353
+		intValue = -749416207
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1494841217
+		intValue = 1897816947
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 2026615431
+		intValue = 1642061929
 	)
 	@Export("z")
 	int z;
@@ -47,82 +29,66 @@ public class FaceNormal {
 	FaceNormal() {
 	}
 
-	@ObfuscatedName("iy")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		signature = "([Lho;IIIZI)V",
+		signature = "(II)V",
-		garbageValue = "2028417948"
+		garbageValue = "-973017204"
 	)
-	@Export("resizeInterface")
+	@Export("runWidgetOnLoadListener")
-	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+	static void runWidgetOnLoadListener(int var0) {
-		for (int var5 = 0; var5 < var0.length; ++var5) {
+		if (var0 != -1) {
-			Widget var6 = var0[var5];
+			if (TextureProvider.loadInterface(var0)) {
-			if (var6 != null && var6.parentId == var1) {
+				Widget[] var1 = Widget.Widget_interfaceComponents[var0];
-				TileItem.alignWidgetSize(var6, var2, var3, var4);
+
-				class30.alignWidgetPosition(var6, var2, var3);
+				for (int var2 = 0; var2 < var1.length; ++var2) {
-				if (var6.scrollX > var6.scrollWidth - var6.width) {
+					Widget var3 = var1[var2];
-					var6.scrollX = var6.scrollWidth - var6.width;
+					if (var3.onLoad != null) {
+						ScriptEvent var4 = new ScriptEvent();
+						var4.widget = var3;
+						var4.args = var3.onLoad;
+						class4.runScript(var4, 5000000);
+					}
 				}
 
-				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) {
-					GameShell.revalidateWidgetScroll(var0, var6, var4);
-				}
 			}
 		}
-
 	}
 
-	@ObfuscatedName("ki")
+	@ObfuscatedName("hl")
 	@ObfuscatedSignature(
-		signature = "(Lho;II)Ljava/lang/String;",
+		signature = "(Lbn;I)V",
-		garbageValue = "-1147965976"
+		garbageValue = "-935329851"
 	)
-	static String method3228(Widget var0, int var1) {
+	static final void method3396(PendingSpawn var0) {
-		int var3 = class2.getWidgetClickMask(var0);
+		long var1 = 0L;
-		boolean var2 = (var3 >> var1 + 1 & 1) != 0;
+		int var3 = -1;
-		if (!var2 && var0.onOp == null) {
+		int var4 = 0;
-			return null;
+		int var5 = 0;
-		} else {
+		if (var0.type == 0) {
-			return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null;
+			var1 = WorldMapArea.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
-		}
-	}
-
-	@ObfuscatedName("kr")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZB)Ljava/lang/String;",
-		garbageValue = "17"
-	)
-	static String method3229(String var0, boolean var1) {
-		String var2 = var1 ? "https://" : "http://";
-		if (Client.gameBuild == 1) {
-			var0 = var0 + "-wtrc";
-		} else if (Client.gameBuild == 2) {
-			var0 = var0 + "-wtqa";
-		} else if (Client.gameBuild == 3) {
-			var0 = var0 + "-wtwip";
-		} else if (Client.gameBuild == 5) {
-			var0 = var0 + "-wti";
-		} else if (Client.gameBuild == 4) {
-			var0 = "local";
 		}
 
-		String var3 = "";
+		if (var0.type == 1) {
-		if (class197.field2390 != null) {
+			var1 = WorldMapArea.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
-			var3 = "/p=" + class197.field2390;
 		}
 
-		String var4 = "runescape.com";
+		if (var0.type == 2) {
-		return var2 + var0 + "." + var4 + "/l=" + WorldMapLabelSize.clientLanguage + "/a=" + WorldMapArea.field218 + var3 + "/";
+			var1 = WorldMapArea.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 3) {
+			var1 = WorldMapArea.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var1 != 0L) {
+			int var6 = WorldMapArea.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1);
+			var3 = UserComparator8.Entity_unpackID(var1);
+			var4 = var6 & 31;
+			var5 = var6 >> 6 & 3;
+		}
+
+		var0.objectId = var3;
+		var0.field914 = var4;
+		var0.field913 = var5;
 	}
 }

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

@@ -4,16 +4,16 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("fg")
+@ObfuscatedName("fv")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("FileSystem_hasPermissions")
-	public static boolean FileSystem_hasPermissions;
+	static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("FileSystem_cacheDir")
-	public static File FileSystem_cacheDir;
+	static File FileSystem_cacheDir;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
 

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

@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lu")
+@ObfuscatedName("lt")
 @Implements("FillMode")
 public enum FillMode implements Enumerated {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Llt;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "Llt;"
+	)
+	field3847(1, 1),
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Llt;"
 	)
-	field3856(1, 1),
+	field3849(2, 2);
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "Llu;"
-	)
-	field3857(2, 2);
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -640256921
+		intValue = -626837763
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -532498775
+		intValue = -1570105459
 	)
 	@Export("id")
 	final int id;
@@ -42,43 +42,13 @@ public enum FillMode implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(S)I",
+		signature = "(I)I",
-		garbageValue = "221"
+		garbageValue = "-1993081102"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(I)Llf;",
-		garbageValue = "1508787563"
-	)
-	static Sprite method6030() {
-		Sprite var0 = new Sprite();
-		var0.width = class325.SpriteBuffer_spriteWidth;
-		var0.height = Frames.SpriteBuffer_spriteHeight;
-		var0.xOffset = class325.SpriteBuffer_xOffsets[0];
-		var0.yOffset = MusicPatchPcmStream.SpriteBuffer_yOffsets[0];
-		var0.subWidth = class325.SpriteBuffer_spriteWidths[0];
-		var0.subHeight = RunException.SpriteBuffer_spriteHeights[0];
-		int var1 = var0.subHeight * var0.subWidth;
-		byte[] var2 = PacketBufferNode.SpriteBuffer_pixels[0];
-		var0.pixels = new int[var1];
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			var0.pixels[var3] = class325.SpriteBuffer_spritePalette[var2[var3] & 255];
-		}
-
-		class325.SpriteBuffer_xOffsets = null;
-		MusicPatchPcmStream.SpriteBuffer_yOffsets = null;
-		class325.SpriteBuffer_spriteWidths = null;
-		RunException.SpriteBuffer_spriteHeights = null;
-		class325.SpriteBuffer_spritePalette = null;
-		PacketBufferNode.SpriteBuffer_pixels = null;
-		return var0;
-	}
 }

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

@@ -4,48 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dj")
+@ObfuscatedName("dx")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("d")
+	@ObfuscatedName("na")
 	@ObfuscatedGetter(
-		intValue = 1829552079
+		intValue = 379430595
 	)
-	@Export("canvasWidth")
+	@Export("widgetDragDuration")
-	public static int canvasWidth;
+	static int widgetDragDuration;
-	@ObfuscatedName("z")
+	@ObfuscatedName("pe")
 	@ObfuscatedSignature(
-		signature = "Ler;"
+		signature = "Llx;"
 	)
-	@Export("entity")
+	@Export("sceneMinimapSprite")
-	public Entity entity;
+	static Sprite sceneMinimapSprite;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1834213503
+		intValue = 1575825247
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 461857131
+		intValue = -455882757
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -848464295
+		intValue = 733154095
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("r")
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "Lep;"
+	)
+	@Export("entity")
+	public Entity entity;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = 3642112439868332829L
+		longValue = -4694647978187683379L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1953587145
+		intValue = -984240523
 	)
 	@Export("flags")
 	int flags;
@@ -53,48 +59,25 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)Lhs;",
+		signature = "(IIIIIIB)I",
-		garbageValue = "-1156266256"
+		garbageValue = "30"
 	)
-	public static ServerBuild method2841(int var0) {
+	public static int method3010(int var0, int var1, int var2, int var3, int var4, int var5) {
-		ServerBuild[] var1 = new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.LIVE, ServerBuild.RC, ServerBuild.WIP};
+		if ((var5 & 1) == 1) {
-		ServerBuild[] var2 = var1;
+			int var6 = var3;
-
+			var3 = var4;
-		for (int var3 = 0; var3 < var2.length; ++var3) {
+			var4 = var6;
-			ServerBuild var4 = var2[var3];
-			if (var0 == var4.field3079) {
-				return var4;
-			}
 		}
 
-		return null;
+		var2 &= 3;
-	}
+		if (var2 == 0) {
-
+			return var0;
-	@ObfuscatedName("jl")
+		} else if (var2 == 1) {
-	@ObfuscatedSignature(
+			return var1;
-		signature = "(IIIILlf;Lhz;S)V",
-		garbageValue = "1700"
-	)
-	@Export("worldToMinimap")
-	static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-		int var6 = var3 * var3 + var2 * var2;
-		if (var6 > 4225 && var6 < 90000) {
-			int var7 = Client.camAngleY & 2047;
-			int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
-			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
-			int var10 = var9 * var2 + var3 * var8 >> 16;
-			int var11 = var3 * var9 - var8 * var2 >> 16;
-			double var12 = Math.atan2((double)var10, (double)var11);
-			int var14 = var5.width / 2 - 25;
-			int var15 = (int)(Math.sin(var12) * (double)var14);
-			int var16 = (int)(Math.cos(var12) * (double)var14);
-			byte var17 = 20;
-			PendingSpawn.redHintArrowSprite.method6090(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
 		} else {
-			class208.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
+			return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1);
 		}
-
 	}
 }

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

@@ -1,82 +1,78 @@
-import java.awt.FontMetrics;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ii")
+@ObfuscatedName("is")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("FloorOverlayDefinition_archive")
-	public static AbstractArchive FloorOverlayDefinition_archive;
+	static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("n")
-	@Export("loginScreenFontMetrics")
-	static FontMetrics loginScreenFontMetrics;
-	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1255212273
+		intValue = 174203121
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1279665091
+		intValue = 1513667197
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 420813751
+		intValue = -173396079
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1507689835
+		intValue = -538711707
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -898918847
+		intValue = 343032535
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -298509321
+		intValue = -459750833
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 171308105
+		intValue = 675536463
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1584668069
+		intValue = -1939857721
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1614583675
+		intValue = 773106025
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -85,20 +81,20 @@ public class FloorOverlayDefinition extends DualNode {
 		FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	public FloorOverlayDefinition() {
+	FloorOverlayDefinition() {
 		this.primaryRgb = 0;
 		this.texture = -1;
 		this.hideUnderlay = true;
 		this.secondaryRgb = -1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(S)V",
-		garbageValue = "1"
+		garbageValue = "-4204"
 	)
 	@Export("postDecode")
-	public void postDecode() {
+	void postDecode() {
 		if (this.secondaryRgb != -1) {
 			this.setHsl(this.secondaryRgb);
 			this.secondaryHue = this.hue;
@@ -109,13 +105,13 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkl;IB)V",
+		signature = "(Lkc;IB)V",
-		garbageValue = "64"
+		garbageValue = "-1"
 	)
 	@Export("decode")
-	public void decode(Buffer var1, int var2) {
+	void decode(Buffer var1, int var2) {
 		while (true) {
 			int var3 = var1.readUnsignedByte();
 			if (var3 == 0) {
@@ -128,8 +124,8 @@ public class FloorOverlayDefinition extends DualNode {
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkl;III)V",
+		signature = "(Lkc;III)V",
-		garbageValue = "-973510442"
+		garbageValue = "1158781542"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -146,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-1969849655"
+		garbageValue = "109"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -177,7 +173,7 @@ public class FloorOverlayDefinition 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);
 			}
@@ -190,15 +186,15 @@ public class FloorOverlayDefinition extends DualNode {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var10 == var4) {
 				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-			} else if (var6 == var10) {
+			} else if (var10 == var6) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
+				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
 		this.hue = (int)(256.0D * var12);
 		this.saturation = (int)(256.0D * var14);
-		this.lightness = (int)(var16 * 256.0D);
+		this.lightness = (int)(256.0D * var16);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -212,43 +208,4 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
-		garbageValue = "137024567"
-	)
-	public static String method4716(CharSequence[] var0, int var1, int var2) {
-		if (var2 == 0) {
-			return "";
-		} else if (var2 == 1) {
-			CharSequence var3 = var0[var1];
-			return var3 == null ? "null" : var3.toString();
-		} else {
-			int var8 = var2 + var1;
-			int var4 = 0;
-
-			for (int var5 = var1; var5 < var8; ++var5) {
-				CharSequence var6 = var0[var5];
-				if (var6 == null) {
-					var4 += 4;
-				} else {
-					var4 += var6.length();
-				}
-			}
-
-			StringBuilder var9 = new StringBuilder(var4);
-
-			for (int var10 = var1; var10 < var8; ++var10) {
-				CharSequence var7 = var0[var10];
-				if (var7 == null) {
-					var9.append("null");
-				} else {
-					var9.append(var7);
-				}
-			}
-
-			return var9.toString();
-		}
-	}
 }

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

@@ -4,48 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iu")
+@ObfuscatedName("ir")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("z")
+	@ObfuscatedName("qu")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lct;"
+	)
+	@Export("pcmStreamMixer")
+	static PcmStreamMixer pcmStreamMixer;
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "Lhq;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
 	public static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1923870903
+		intValue = 1804516089
+	)
+	@Export("canvasHeight")
+	public static int canvasHeight;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 1186961111
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -2031878355
+		intValue = 2037772261
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 922832793
+		intValue = 232580593
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1084903515
+		intValue = -818130019
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 568958993
+		intValue = 820254553
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -54,27 +66,27 @@ public class FloorUnderlayDefinition extends DualNode {
 		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	FloorUnderlayDefinition() {
+	public FloorUnderlayDefinition() {
 		this.rgb = 0;
 	}
 
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "65"
+	)
+	@Export("postDecode")
+	public void postDecode() {
+		this.setHsl(this.rgb);
+	}
+
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Lkc;II)V",
-		garbageValue = "-2090929650"
+		garbageValue = "-2043109243"
-	)
-	@Export("postDecode")
-	void postDecode() {
-		this.setHsl(this.rgb);
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(Lkl;II)V",
-		garbageValue = "-840924474"
 	)
 	@Export("decode")
-	void decode(Buffer var1, int var2) {
+	public void decode(Buffer var1, int var2) {
 		while (true) {
 			int var3 = var1.readUnsignedByte();
 			if (var3 == 0) {
@@ -85,10 +97,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkl;III)V",
+		signature = "(Lkc;III)V",
-		garbageValue = "-1673078715"
+		garbageValue = "347709925"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -98,10 +110,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "307020215"
+		garbageValue = "1"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -128,8 +140,8 @@ public class FloorUnderlayDefinition extends DualNode {
 
 		double var12 = 0.0D;
 		double var14 = 0.0D;
-		double var16 = (var10 + var8) / 2.0D;
+		double var16 = (var8 + var10) / 2.0D;
-		if (var10 != var8) {
+		if (var8 != var10) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var8 + var10);
 			}
@@ -138,18 +150,18 @@ public class FloorUnderlayDefinition extends DualNode {
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var10 == var2) {
+			if (var2 == var10) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var10 == var4) {
+			} else if (var4 == var10) {
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
 			} else if (var6 == var10) {
 				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
-		this.saturation = (int)(256.0D * var14);
+		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) {
@@ -163,9 +175,9 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 
 		if (var16 > 0.5D) {
-			this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16));
+			this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D);
 		} else {
-			this.hueMultiplier = (int)(512.0D * var16 * var14);
+			this.hueMultiplier = (int)(var14 * var16 * 512.0D);
 		}
 
 		if (this.hueMultiplier < 1) {
@@ -174,28 +186,4 @@ public class FloorUnderlayDefinition extends DualNode {
 
 		this.hue = (int)((double)this.hueMultiplier * var12);
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(B)[Lcn;",
-		garbageValue = "126"
-	)
-	static AttackOption[] method4395() {
-		return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "(IIB)I",
-		garbageValue = "1"
-	)
-	@Export("ItemContainer_getCount")
-	static int ItemContainer_getCount(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var2 == null) {
-			return 0;
-		} else {
-			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0;
-		}
-	}
 }

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

@@ -2,7 +2,7 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("kn")
+@ObfuscatedName("ks")
 @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("z")
+	@ObfuscatedName("a")
 	@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("n")
+	@ObfuscatedName("t")
 	@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,57 +2,54 @@ 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;
+import net.runelite.rs.Reflection;
 
-@ObfuscatedName("ko")
+@ObfuscatedName("kq")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		signature = "Llp;"
-	)
-	@Export("logoSprite")
-	static IndexedSprite logoSprite;
 	@ObfuscatedName("o")
-	@Export("Tiles_hueMultiplier")
+	@ObfuscatedSignature(
-	static int[] Tiles_hueMultiplier;
+		signature = "Llx;"
-	@ObfuscatedName("q")
+	)
+	@Export("rightTitleSprite")
+	static Sprite rightTitleSprite;
+	@ObfuscatedName("c")
 	@Export("name")
 	String name;
 
@@ -69,82 +66,125 @@ public class FontName {
 		this.name = var1;
 	}
 
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(B)[Lko;",
-		garbageValue = "-88"
-	)
-	public static FontName[] method5272() {
-		return new FontName[]{FontName_verdana13, FontName_bold12, FontName_verdana11, FontName_plain12, FontName_verdana15, FontName_plain11};
-	}
-
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(Ljava/lang/String;I)Ljava/lang/Class;",
-		garbageValue = "14"
+		garbageValue = "703814886"
 	)
-	static void method5266() {
+	@Export("loadClassFromDescriptor")
-		ItemContainer.itemContainers = new NodeHashTable(32);
+	static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
-	}
+		if (var0.equals("B")) {
-
+			return Byte.TYPE;
-	@ObfuscatedName("o")
+		} else if (var0.equals("I")) {
-	@ObfuscatedSignature(
+			return Integer.TYPE;
-		signature = "(ILcu;ZI)I",
+		} else if (var0.equals("S")) {
-		garbageValue = "-1537038267"
+			return Short.TYPE;
-	)
+		} else if (var0.equals("J")) {
-	static int method5271(int var0, Script var1, boolean var2) {
+			return Long.TYPE;
-		Widget var3 = var2 ? GrandExchangeOfferAgeComparator.field76 : KitDefinition.field3252;
+		} else if (var0.equals("Z")) {
-		if (var0 == ScriptOpcodes.CC_GETX) {
+			return Boolean.TYPE;
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x;
+		} else if (var0.equals("F")) {
-			return 1;
+			return Float.TYPE;
-		} else if (var0 == ScriptOpcodes.CC_GETY) {
+		} else if (var0.equals("D")) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y;
+			return Double.TYPE;
-			return 1;
+		} else if (var0.equals("C")) {
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
+			return Character.TYPE;
-			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;
 		} else {
-			return 2;
+			return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0);
 		}
 	}
 
-	@ObfuscatedName("jr")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lbk;ZI)V",
+		signature = "(II)V",
-		garbageValue = "2027801614"
+		garbageValue = "348293638"
 	)
-	@Export("closeInterface")
+	@Export("clearItemContainer")
-	static final void closeInterface(InterfaceParent var0, boolean var1) {
+	static void clearItemContainer(int var0) {
-		int var2 = var0.group;
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		int var3 = (int)var0.key;
+		if (var1 != null) {
-		var0.remove();
+			for (int var2 = 0; var2 < var1.ids.length; ++var2) {
-		if (var1) {
+				var1.ids[var2] = -1;
-			InterfaceParent.method1192(var2);
+				var1.quantities[var2] = 0;
+			}
+
+		}
+	}
+
+	@ObfuscatedName("gh")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "-837375180"
+	)
+	@Export("setWindowedMode")
+	static void setWindowedMode(int var0) {
+		Client.field736 = 0L;
+		if (var0 >= 2) {
+			Client.isResizable = true;
+		} else {
+			Client.isResizable = false;
 		}
 
-		for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
+		if (WallDecoration.getWindowedMode() == 1) {
-			if ((long)var2 == (var4.key >> 48 & 65535L)) {
+			WorldMapID.client.setMaxCanvasSize(765, 503);
-				var4.remove();
+		} else {
+			WorldMapID.client.setMaxCanvasSize(7680, 2160);
+		}
+
+		if (Client.gameState >= 25) {
+			PacketBufferNode var1 = SoundSystem.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher);
+			var1.packetBuffer.writeByte(WallDecoration.getWindowedMode());
+			var1.packetBuffer.writeShort(class286.canvasWidth);
+			var1.packetBuffer.writeShort(FloorUnderlayDefinition.canvasHeight);
+			Client.packetWriter.addNode(var1);
+		}
+
+	}
+
+	@ObfuscatedName("hw")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1528266884"
+	)
+	static final void method5442() {
+		for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) {
+			if (var0.plane == Player.Scene_plane && !var0.isFinished) {
+				if (Client.cycle >= var0.cycleStart) {
+					var0.advance(Client.field693);
+					if (var0.isFinished) {
+						var0.remove();
+					} else {
+						WorldMapArea.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false);
+					}
+				}
+			} else {
+				var0.remove();
 			}
 		}
 
-		Widget var5 = Canvas.getWidget(var3);
+	}
-		if (var5 != null) {
-			WorldMapSectionType.invalidateWidget(var5);
-		}
 
-		SecureRandomFuture.method2138();
+	@ObfuscatedName("lp")
-		if (Client.rootInterface != -1) {
+	@ObfuscatedSignature(
-			class40.runIntfCloseListeners(Client.rootInterface, 1);
+		signature = "(I)V",
+		garbageValue = "-1324423171"
+	)
+	static void method5443() {
+		if (Client.field645 && class215.localPlayer != null) {
+			int var0 = class215.localPlayer.pathX[0];
+			int var1 = class215.localPlayer.pathY[0];
+			if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) {
+				return;
+			}
+
+			IgnoreList.oculusOrbFocalPointX = class215.localPlayer.x;
+			int var2 = GraphicsObject.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, Player.Scene_plane) - Client.camFollowHeight;
+			if (var2 < Tiles.field497) {
+				Tiles.field497 = var2;
+			}
+
+			AbstractArchive.oculusOrbFocalPointY = class215.localPlayer.y;
+			Client.field645 = false;
 		}
 
 	}

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

@@ -4,27 +4,27 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kr")
+@ObfuscatedName("ko")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;)V"
+		signature = "(Lhq;Lhq;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -32,10 +32,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "([Lko;I)Ljava/util/HashMap;",
+		signature = "([Lkq;B)Ljava/util/HashMap;",
-		garbageValue = "-1165155916"
+		garbageValue = "-73"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -52,7 +52,7 @@ public class Fonts {
 				String var9 = var5.name;
 				int var10 = var7.getGroupId(var9);
 				int var11 = var7.getFileId(var10, "");
-				Font var6 = ClanMate.method4976(var7, var8, var10, var11);
+				Font var6 = class269.method5114(var7, var8, var10, var11);
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -62,22 +62,4 @@ public class Fonts {
 
 		return var2;
 	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "(II)Lkc;",
-		garbageValue = "202775938"
-	)
-	public static PrivateChatMode method5273(int var0) {
-		PrivateChatMode[] var1 = BZip2State.ChatMode_values();
-
-		for (int var2 = 0; var2 < var1.length; ++var2) {
-			PrivateChatMode var3 = var1[var2];
-			if (var0 == var3.field3793) {
-				return var3;
-			}
-		}
-
-		return null;
-	}
 }

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

@@ -1,39 +1,26 @@
 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("ep")
+@ObfuscatedName("em")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -779358423
-	)
-	@Export("SpriteBuffer_spriteHeight")
-	public static int SpriteBuffer_spriteHeight;
-	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		signature = "[Llp;"
+		signature = "Lkc;"
 	)
-	@Export("worldSelectStars")
+	@Export("NetCache_responseArchiveBuffer")
-	static IndexedSprite[] worldSelectStars;
+	public static Buffer NetCache_responseArchiveBuffer;
-	@ObfuscatedName("jg")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lho;"
+		signature = "[Ldw;"
-	)
-	@Export("dragInventoryWidget")
-	static Widget dragInventoryWidget;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "[Lda;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;IZ)V",
+		signature = "(Lhq;Lhq;IZ)V",
 		garbageValue = "0"
 	)
 	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
@@ -65,13 +52,59 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-546780661"
+		garbageValue = "1903935769"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
+
+	@ObfuscatedName("fc")
+	@ObfuscatedSignature(
+		signature = "(IB)V",
+		garbageValue = "3"
+	)
+	@Export("forceDisconnect")
+	static final void forceDisconnect(int var0) {
+		class1.logOut();
+		switch(var0) {
+		case 1:
+			Login.loginIndex = 24;
+			GrandExchangeOffer.setLoginResponseString("", "You were disconnected from the server.", "");
+			break;
+		case 2:
+			Players.method2298();
+		}
+
+	}
+
+	@ObfuscatedName("gb")
+	@ObfuscatedSignature(
+		signature = "(S)V",
+		garbageValue = "-13007"
+	)
+	static void method3397() {
+		if (class215.localPlayer.x >> 7 == Client.destinationX && class215.localPlayer.y >> 7 == Client.destinationY) {
+			Client.destinationX = 0;
+		}
+
+	}
+
+	@ObfuscatedName("jp")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "-244259971"
+	)
+	static boolean method3400(int var0) {
+		for (int var1 = 0; var1 < Client.field866; ++var1) {
+			if (Client.field854[var1] == var0) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

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

@@ -3,21 +3,21 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jy")
+@ObfuscatedName("jf")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
-	boolean field3615;
+	boolean field3613;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
-	boolean field3614;
+	boolean field3611;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljy;I)I",
+		signature = "(Ljf;I)I",
-		garbageValue = "371914259"
+		garbageValue = "-1251947576"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -29,23 +29,23 @@ public class Friend extends Buddy {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3615 && !var1.field3615) {
+		} else if (this.field3613 && !var1.field3613) {
 			return -1;
-		} else if (!this.field3615 && var1.field3615) {
+		} else if (!this.field3613 && var1.field3613) {
 			return 1;
-		} else if (this.field3614 && !var1.field3614) {
+		} else if (this.field3611 && !var1.field3611) {
 			return -1;
-		} else if (!this.field3614 && var1.field3614) {
+		} else if (!this.field3611 && var1.field3611) {
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		signature = "(Ljh;I)I",
+		signature = "(Ljg;I)I",
-		garbageValue = "-531306911"
+		garbageValue = "105019827"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -55,312 +55,4 @@ public class Friend extends Buddy {
 	public int compareTo(Object var1) {
 		return this.compareToFriend((Friend)var1);
 	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "530220947"
-	)
-	static void method5148() {
-		Tiles.field501 = null;
-		Tiles.field483 = null;
-		DevicePcmPlayerProvider.field393 = null;
-		class287.field3634 = null;
-		Tiles.field488 = null;
-		Tiles.field486 = null;
-		DevicePcmPlayerProvider.field386 = null;
-		Tiles.Tiles_hue = null;
-		ArchiveLoader.Tiles_saturation = null;
-		Tiles.Tiles_lightness = null;
-		FontName.Tiles_hueMultiplier = null;
-		Tiles.field487 = null;
-	}
-
-	@ObfuscatedName("fp")
-	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "-541695875"
-	)
-	@Export("drawEntities")
-	static final void drawEntities(int var0, int var1, int var2, int var3) {
-		++Client.viewportDrawCount;
-		if (class223.localPlayer.x >> 7 == Client.destinationX && class223.localPlayer.y >> 7 == Client.destinationY) {
-			Client.destinationX = 0;
-		}
-
-		if (Client.renderSelf) {
-			Players.addPlayerToScene(class223.localPlayer, false);
-		}
-
-		UrlRequest.method3279();
-		class4.addNpcsToScene(true);
-		Login.method2114();
-		class4.addNpcsToScene(false);
-		DynamicObject.method2225();
-
-		for (GraphicsObject var4 = (GraphicsObject)Client.graphicsObjects.last(); var4 != null; var4 = (GraphicsObject)Client.graphicsObjects.previous()) {
-			if (var4.plane == WorldMapRectangle.plane && !var4.isFinished) {
-				if (Client.cycle >= var4.cycleStart) {
-					var4.advance(Client.field698);
-					if (var4.isFinished) {
-						var4.remove();
-					} else {
-						PacketWriter.scene.drawEntity(var4.plane, var4.x, var4.y, var4.height, 60, var4, 0, -1L, false);
-					}
-				}
-			} else {
-				var4.remove();
-			}
-		}
-
-		AbstractByteArrayCopier.setViewportShape(var0, var1, var2, var3, true);
-		var0 = Client.viewportOffsetX;
-		var1 = Client.viewportOffsetY;
-		var2 = Client.viewportWidth;
-		var3 = Client.viewportHeight;
-		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var11;
-		int var15;
-		if (!Client.isCameraLocked) {
-			var15 = Client.camAngleX;
-			if (Client.field722 / 256 > var15) {
-				var15 = Client.field722 / 256;
-			}
-
-			if (Client.field835[4] && Client.field883[4] + 128 > var15) {
-				var15 = Client.field883[4] + 128;
-			}
-
-			var5 = Client.camAngleY & 2047;
-			var6 = ObjectSound.oculusOrbFocalPointX;
-			var7 = ModelData0.field1840;
-			var8 = class14.oculusOrbFocalPointY;
-			var11 = var15 * 3 + 600;
-			NPCDefinition.method4677(var6, var7, var8, var15, var5, var11, var3);
-		}
-
-		int var9;
-		int var10;
-		int var12;
-		int var13;
-		int var14;
-		if (!Client.isCameraLocked) {
-			if (AbstractArchive.clientPreferences.roofsHidden) {
-				var5 = WorldMapRectangle.plane;
-			} else {
-				label409: {
-					var6 = 3;
-					if (IgnoreList.cameraPitch < 310) {
-						if (Client.oculusOrbState == 1) {
-							var7 = ObjectSound.oculusOrbFocalPointX >> 7;
-							var8 = class14.oculusOrbFocalPointY >> 7;
-						} else {
-							var7 = class223.localPlayer.x >> 7;
-							var8 = class223.localPlayer.y >> 7;
-						}
-
-						var9 = GrandExchangeOfferOwnWorldComparator.cameraX >> 7;
-						var10 = WorldMapIcon_1.cameraZ >> 7;
-						if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) {
-							var5 = WorldMapRectangle.plane;
-							break label409;
-						}
-
-						if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) {
-							var5 = WorldMapRectangle.plane;
-							break label409;
-						}
-
-						if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
-							var6 = WorldMapRectangle.plane;
-						}
-
-						if (var7 > var9) {
-							var11 = var7 - var9;
-						} else {
-							var11 = var9 - var7;
-						}
-
-						if (var8 > var10) {
-							var12 = var8 - var10;
-						} else {
-							var12 = var10 - var8;
-						}
-
-						if (var11 > var12) {
-							var13 = var12 * 65536 / var11;
-							var14 = 32768;
-
-							while (var7 != var9) {
-								if (var9 < var7) {
-									++var9;
-								} else if (var9 > var7) {
-									--var9;
-								}
-
-								if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
-									var6 = WorldMapRectangle.plane;
-								}
-
-								var14 += var13;
-								if (var14 >= 65536) {
-									var14 -= 65536;
-									if (var10 < var8) {
-										++var10;
-									} else if (var10 > var8) {
-										--var10;
-									}
-
-									if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
-										var6 = WorldMapRectangle.plane;
-									}
-								}
-							}
-						} else if (var12 > 0) {
-							var13 = var11 * 65536 / var12;
-							var14 = 32768;
-
-							while (var8 != var10) {
-								if (var10 < var8) {
-									++var10;
-								} else if (var10 > var8) {
-									--var10;
-								}
-
-								if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
-									var6 = WorldMapRectangle.plane;
-								}
-
-								var14 += var13;
-								if (var14 >= 65536) {
-									var14 -= 65536;
-									if (var9 < var7) {
-										++var9;
-									} else if (var9 > var7) {
-										--var9;
-									}
-
-									if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
-										var6 = WorldMapRectangle.plane;
-									}
-								}
-							}
-						}
-					}
-
-					if (class223.localPlayer.x >= 0 && class223.localPlayer.y >= 0 && class223.localPlayer.x < 13312 && class223.localPlayer.y < 13312) {
-						if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][class223.localPlayer.x >> 7][class223.localPlayer.y >> 7] & 4) != 0) {
-							var6 = WorldMapRectangle.plane;
-						}
-
-						var5 = var6;
-					} else {
-						var5 = WorldMapRectangle.plane;
-					}
-				}
-			}
-
-			var15 = var5;
-		} else {
-			var15 = class208.getHighestVisiblePlane();
-		}
-
-		var5 = GrandExchangeOfferOwnWorldComparator.cameraX;
-		var6 = Varcs.cameraY;
-		var7 = WorldMapIcon_1.cameraZ;
-		var8 = IgnoreList.cameraPitch;
-		var9 = WorldMapSection2.cameraYaw;
-
-		for (var10 = 0; var10 < 5; ++var10) {
-			if (Client.field835[var10]) {
-				var11 = (int)(Math.random() * (double)(Client.field882[var10] * 2 + 1) - (double)Client.field882[var10] + Math.sin((double)Client.field884[var10] / 100.0D * (double)Client.field885[var10]) * (double)Client.field883[var10]);
-				if (var10 == 0) {
-					GrandExchangeOfferOwnWorldComparator.cameraX += var11;
-				}
-
-				if (var10 == 1) {
-					Varcs.cameraY += var11;
-				}
-
-				if (var10 == 2) {
-					WorldMapIcon_1.cameraZ += var11;
-				}
-
-				if (var10 == 3) {
-					WorldMapSection2.cameraYaw = var11 + WorldMapSection2.cameraYaw & 2047;
-				}
-
-				if (var10 == 4) {
-					IgnoreList.cameraPitch += var11;
-					if (IgnoreList.cameraPitch < 128) {
-						IgnoreList.cameraPitch = 128;
-					}
-
-					if (IgnoreList.cameraPitch > 383) {
-						IgnoreList.cameraPitch = 383;
-					}
-				}
-			}
-		}
-
-		var10 = MouseHandler.MouseHandler_x;
-		var11 = MouseHandler.MouseHandler_y;
-		if (MouseHandler.MouseHandler_lastButton != 0) {
-			var10 = MouseHandler.MouseHandler_lastPressedX;
-			var11 = MouseHandler.MouseHandler_lastPressedY;
-		}
-
-		if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
-			WorldMapSection1.method582(var10 - var0, var11 - var1);
-		} else {
-			MenuAction.method2066();
-		}
-
-		WorldMapID.playPcmPlayers();
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
-		WorldMapID.playPcmPlayers();
-		var12 = Rasterizer3D.Rasterizer3D_zoom;
-		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
-		PacketWriter.scene.draw(GrandExchangeOfferOwnWorldComparator.cameraX, Varcs.cameraY, WorldMapIcon_1.cameraZ, IgnoreList.cameraPitch, WorldMapSection2.cameraYaw, var15);
-		Rasterizer3D.Rasterizer3D_zoom = var12;
-		WorldMapID.playPcmPlayers();
-		PacketWriter.scene.clearTempGameObjects();
-		ViewportMouse.method2954(var0, var1, var2, var3);
-		Message.method1231(var0, var1);
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field698);
-		Client.field634 = 0;
-		var13 = class223.baseX * 64 + (class223.localPlayer.x >> 7);
-		var14 = class286.baseY * 64 + (class223.localPlayer.y >> 7);
-		if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) {
-			Client.field634 = 1;
-		}
-
-		if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) {
-			Client.field634 = 1;
-		}
-
-		if (Client.field634 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) {
-			Client.field634 = 0;
-		}
-
-		GrandExchangeOfferOwnWorldComparator.cameraX = var5;
-		Varcs.cameraY = var6;
-		WorldMapIcon_1.cameraZ = var7;
-		IgnoreList.cameraPitch = var8;
-		WorldMapSection2.cameraYaw = var9;
-		if (Client.isLoading && class1.method5(true, false) == 0) {
-			Client.isLoading = false;
-		}
-
-		if (Client.isLoading) {
-			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
-			WorldMapSprite.drawLoadingMessage("Loading - please wait.", false);
-		}
-
-	}
 }

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

@@ -3,96 +3,37 @@ 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")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("o")
+	@ObfuscatedName("gr")
 	@ObfuscatedSignature(
-		signature = "Ldq;"
+		signature = "[Llx;"
 	)
-	@Export("soundCache")
+	@Export("headIconPkSprites")
-	public static SoundCache soundCache;
+	static Sprite[] headIconPkSprites;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1649732045
+		intValue = -1234988847
 	)
-	public int field3627;
+	public int field3624;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Ljq;"
+		signature = "Lju;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		signature = "(Ljq;I)V"
+		signature = "(Lju;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3627 = (int)(class30.currentTimeMillis() / 1000L);
+		this.field3624 = (int)(PlayerAppearance.currentTimeMillis() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZS)I",
-		garbageValue = "-14883"
-	)
-	static int method5193(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var3 = Canvas.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? GrandExchangeOfferAgeComparator.field76 : KitDefinition.field3252;
-		}
-
-		WorldMapSectionType.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[--Interpreter.Interpreter_intStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) {
-				var3.modelType = 3;
-				var3.modelId = class223.localPlayer.appearance.getChatHeadId();
-				return 1;
-			} else {
-				return 2;
-			}
-		} else {
-			Interpreter.Interpreter_intStackSize -= 2;
-			int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			var3.itemId = var4;
-			var3.itemQuantity = var5;
-			ItemDefinition var6 = Occluder.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 | var6.isStackable == 1) {
-				var3.itemQuantityMode = 1;
-			} else {
-				var3.itemQuantityMode = 2;
-			}
-
-			if (var3.field2667 > 0) {
-				var3.modelZoom = var3.modelZoom * 32 / var3.field2667;
-			} else if (var3.rawWidth > 0) {
-				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
-			}
-
-			return 1;
-		}
-	}
 }

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

@@ -4,94 +4,88 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bf")
+@ObfuscatedName("bb")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("kp")
+	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 784647043
-	)
-	@Export("menuWidth")
-	static int menuWidth;
-	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lli;"
+		signature = "Lln;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Ljz;"
+		signature = "Ljh;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ljw;"
+		signature = "Lje;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -154127357
+		intValue = -1502987485
 	)
-	int field1052;
+	int field1044;
 
 	@ObfuscatedSignature(
-		signature = "(Lli;)V"
+		signature = "(Lln;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1052 = 0;
+		this.field1044 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-537546182"
+		garbageValue = "-2101343080"
 	)
-	boolean method1863() {
+	boolean method1973() {
-		return this.field1052 == 2;
+		return this.field1044 == 2;
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1650406039"
+	)
+	final void method1968() {
+		this.field1044 = 1;
 	}
 
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Lkc;II)V",
-		garbageValue = "-1827488115"
+		garbageValue = "1319465817"
-	)
-	final void method1864() {
-		this.field1052 = 1;
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(Lkl;II)V",
-		garbageValue = "87159269"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1052 = 2;
+		this.field1044 = 2;
-		Coord.FriendSystem_invalidateFriends();
+		ByteArrayPool.FriendSystem_invalidateFriends();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1809100173"
+		garbageValue = "-885412524"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3627 < class30.currentTimeMillis() / 1000L - 5L) {
+			if ((long)var1.field3624 < PlayerAppearance.currentTimeMillis() / 1000L - 5L) {
 				if (var1.world > 0) {
-					class210.addGameMessage(5, "", var1.username + " has logged in.");
+					class30.addGameMessage(5, "", var1.username + " has logged in.");
 				}
 
 				if (var1.world == 0) {
-					class210.addGameMessage(5, "", var1.username + " has logged out.");
+					class30.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove();
@@ -100,38 +94,38 @@ public class FriendSystem {
 
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "2097335947"
+		garbageValue = "-44"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1052 = 0;
+		this.field1044 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljq;ZI)Z",
+		signature = "(Lju;ZB)Z",
-		garbageValue = "-99546473"
+		garbageValue = "-128"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(class223.localPlayer.username)) {
+		} else if (var1.equals(class215.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljq;I)Z",
+		signature = "(Lju;S)Z",
-		garbageValue = "-1271048446"
+		garbageValue = "19045"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -142,10 +136,10 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "70213064"
+		garbageValue = "14"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -153,54 +147,41 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				StringBuilder var10000;
-				String var4;
+				String var3;
 				if (this.friendsListIsFull()) {
 					var10000 = null;
-					var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
+					var3 = "Your friend list is full. Max of 200 for free users, and 400 for members";
-					class210.addGameMessage(30, "", var4);
+					class30.addGameMessage(30, "", var3);
-				} else if (class223.localPlayer.username.equals(var2)) {
+				} else if (class215.localPlayer.username.equals(var2)) {
-					var10000 = null;
+					WorldMapRegion.method599();
-					var4 = "You can't add yourself to your own friend list";
+				} else if (this.isFriended(var2, false)) {
-					class210.addGameMessage(30, "", var4);
+					var10000 = (new StringBuilder()).append(var1);
+					Object var10001 = null;
+					var3 = var10000.append(" is already on your friend list").toString();
+					class30.addGameMessage(30, "", var3);
+				} else if (this.isIgnored(var2)) {
+					Players.method2308(var1);
 				} else {
-					Object var10001;
+					method2024(var1);
-					if (this.isFriended(var2, false)) {
-						var10000 = (new StringBuilder()).append(var1);
-						var10001 = null;
-						var4 = var10000.append(" is already on your friend list").toString();
-						class210.addGameMessage(30, "", var4);
-					} else if (this.isIgnored(var2)) {
-						var10000 = new StringBuilder();
-						var10001 = null;
-						var10000 = var10000.append("Please remove ").append(var1);
-						var10001 = null;
-						var4 = var10000.append(" from your ignore list first").toString();
-						class210.addGameMessage(30, "", var4);
-					} else {
-						PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher);
-						var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
-						var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-						Client.packetWriter.addNode(var3);
-					}
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-414102513"
+		garbageValue = "1177214541"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field636 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field749 != 1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "1251138329"
+		garbageValue = "22"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
@@ -208,54 +189,37 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.canAddIgnore()) {
-					WorldMapCacheName.method644();
+					ModelData0.method3380();
+				} else if (class215.localPlayer.username.equals(var2)) {
+					class247.method4642();
+				} else if (this.isIgnored(var2)) {
+					VarbitDefinition.method4651(var1);
+				} else if (this.isFriended(var2, false)) {
+					WorldMapIcon_1.method355(var1);
 				} else {
-					StringBuilder var10000;
+					PacketBufferNode var3 = SoundSystem.getPacketBufferNode(ClientPacket.field2202, Client.packetWriter.isaacCipher);
-					String var4;
+					var3.packetBuffer.writeByte(UserComparator6.stringCp1252NullTerminatedByteSize(var1));
-					if (class223.localPlayer.username.equals(var2)) {
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-						var10000 = null;
+					Client.packetWriter.addNode(var3);
-						var4 = "You can't add yourself to your own ignore list";
-						class210.addGameMessage(30, "", var4);
-					} else {
-						Object var10001;
-						if (this.isIgnored(var2)) {
-							var10000 = (new StringBuilder()).append(var1);
-							var10001 = null;
-							var4 = var10000.append(" is already on your ignore list").toString();
-							class210.addGameMessage(30, "", var4);
-						} else if (this.isFriended(var2, false)) {
-							var10000 = new StringBuilder();
-							var10001 = null;
-							var10000 = var10000.append("Please remove ").append(var1);
-							var10001 = null;
-							var4 = var10000.append(" from your friend list first").toString();
-							class210.addGameMessage(30, "", var4);
-						} else {
-							PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher);
-							var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
-							var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-							Client.packetWriter.addNode(var3);
-						}
-					}
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(B)Z",
-		garbageValue = "30910"
+		garbageValue = "-54"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field636 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field749 != 1;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1378951166"
+		garbageValue = "-248973546"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -263,22 +227,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					Client.field744 = Client.cycleCntr;
+					MilliClock.method3604();
-					PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = SoundSystem.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(UserComparator6.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				Coord.FriendSystem_invalidateFriends();
+				ByteArrayPool.FriendSystem_invalidateFriends();
 			}
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-1989545258"
+		garbageValue = "1867823329"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -286,26 +250,49 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					Client.field744 = Client.cycleCntr;
+					MilliClock.method3604();
-					PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = SoundSystem.getPacketBufferNode(ClientPacket.field2197, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(UserComparator6.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				class195.FriendSystem_invalidateIgnoreds();
+				class42.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljq;I)Z",
+		signature = "(Lju;B)Z",
-		garbageValue = "869979117"
+		garbageValue = "-6"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
 		Friend var2 = (Friend)this.friendsList.getByUsername(var1);
 		return var2 != null && var2.hasWorld();
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-758327012"
+	)
+	static final void method2024(String var0) {
+		PacketBufferNode var1 = SoundSystem.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher);
+		var1.packetBuffer.writeByte(UserComparator6.stringCp1252NullTerminatedByteSize(var0));
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+		Client.packetWriter.addNode(var1);
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "896810620"
+	)
+	public static void method2038() {
+		ItemDefinition.ItemDefinition_cached.clear();
+		ItemDefinition.ItemDefinition_cachedModels.clear();
+		ItemDefinition.ItemDefinition_cachedSprites.clear();
+	}
 }

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

@@ -4,61 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jz")
+@ObfuscatedName("jh")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lli;"
+		signature = "Lln;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 348884647
+		intValue = 823977789
 	)
-	int field3607;
+	int field3603;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lje;"
+		signature = "Lja;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		signature = "(Lli;)V"
+		signature = "(Lln;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3607 = 1;
+		this.field3603 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)Ljh;",
+		signature = "(I)Ljg;",
-		garbageValue = "2"
+		garbageValue = "-706396611"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljh;",
+		signature = "(II)[Ljg;",
-		garbageValue = "951526901"
+		garbageValue = "1510983955"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljq;ZB)Z",
+		signature = "(Lju;ZI)Z",
-		garbageValue = "-80"
+		garbageValue = "-163065823"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -70,10 +70,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		signature = "(Lkl;II)V",
+		signature = "(Lkc;II)V",
-		garbageValue = "-1601651584"
+		garbageValue = "1371210383"
 	)
 	@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.field3607 - 1;
+						var11.int2 = ++this.field3603 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * 1171982777) * -1761858423;
+							var11.int2 = -(var11.int2 * 357239599) * 1797004239;
 						}
 
 						var11.world = var6;
 					}
 
 					var11.rank = var7;
-					var11.field3615 = var9;
+					var11.field3613 = var9;
-					var11.field3614 = var10;
+					var11.field3611 = var10;
 					continue;
 				}
 
@@ -158,4 +158,18 @@ public class FriendsList extends UserList {
 			return;
 		}
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Llr;III)I",
+		garbageValue = "2102175416"
+	)
+	static int method5306(IterableNodeHashTable var0, int var1, int var2) {
+		if (var0 == null) {
+			return var2;
+		} else {
+			IntegerNode var3 = (IntegerNode)var0.get((long)var1);
+			return var3 == null ? var2 : var3.integer;
+		}
+	}
 }

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

@@ -1,20 +1,20 @@
+import java.security.SecureRandom;
 import java.util.zip.Inflater;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lr")
+@ObfuscatedName("lj")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("z")
+	@ObfuscatedName("eo")
+	@Export("secureRandom")
+	static SecureRandom secureRandom;
+	@ObfuscatedName("a")
 	@Export("inflater")
 	Inflater inflater;
 
-	public GZipDecompressor() {
-		this(-1, 1000000, 1000000);
-	}
-
 	@ObfuscatedSignature(
 		signature = "(III)V",
 		garbageValue = "1000000"
@@ -22,10 +22,14 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	@ObfuscatedName("z")
+	public GZipDecompressor() {
+		this(-1, 1000000, 1000000);
+	}
+
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lkl;[BI)V",
+		signature = "(Lkc;[BI)V",
-		garbageValue = "-1227959018"
+		garbageValue = "924316150"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {

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

@@ -4,95 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ej")
+@ObfuscatedName("ex")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("gh")
+	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "[Llf;"
-	)
-	@Export("mapMarkerSprites")
-	static Sprite[] mapMarkerSprites;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "Ler;"
-	)
-	@Export("entity")
-	public Entity entity;
-	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 23072497
+		intValue = -1950933673
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1467218039
+		intValue = -1570818829
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1096373851
+		intValue = -1477915037
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("r")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -921514335
+		intValue = 1448814329
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "Lep;"
+	)
+	@Export("entity")
+	public Entity entity;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1901316909
+		intValue = -1886669661
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -714921437
+		intValue = -564679873
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1336647537
+		intValue = -441030449
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1244242871
+		intValue = -187063391
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1759509999
+		intValue = -1484089673
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1933245697
+		intValue = -875771859
 	)
-	int field1914;
+	int field1912;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 505349389
+		intValue = -1503559581
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		longValue = 2276908467403178719L
+		longValue = -3849133574729992117L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 8294449
+		intValue = 823124257
 	)
 	@Export("flags")
 	int flags;
@@ -101,4 +95,49 @@ public final class GameObject {
 		this.tag = 0L;
 		this.flags = 0;
 	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(Lhi;I[B[BB)V",
+		garbageValue = "-22"
+	)
+	@Export("Widget_setKey")
+	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		if (var0.field2623 == null) {
+			if (var2 == null) {
+				return;
+			}
+
+			var0.field2623 = new byte[11][];
+			var0.field2624 = new byte[11][];
+			var0.field2628 = new int[11];
+			var0.field2626 = new int[11];
+		}
+
+		var0.field2623[var1] = var2;
+		if (var2 != null) {
+			var0.field2606 = true;
+		} else {
+			var0.field2606 = false;
+
+			for (int var4 = 0; var4 < var0.field2623.length; ++var4) {
+				if (var0.field2623[var4] != null) {
+					var0.field2606 = true;
+					break;
+				}
+			}
+		}
+
+		var0.field2624[var1] = var3;
+	}
+
+	@ObfuscatedName("ii")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V",
+		garbageValue = "-59"
+	)
+	@Export("insertMenuItemNoShift")
+	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
+		ArchiveDiskAction.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
+	}
 }

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

@@ -4,36 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("m")
+@ObfuscatedName("o")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("z")
+	@ObfuscatedName("nl")
 	@ObfuscatedGetter(
-		intValue = 1358084805
+		intValue = -1005036451
+	)
+	static int field46;
+	@ObfuscatedName("bu")
+	@ObfuscatedSignature(
+		signature = "[Llx;"
+	)
+	@Export("worldSelectBackSprites")
+	static Sprite[] worldSelectBackSprites;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 1055414531
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = 5655370423736122045L
+		longValue = -1970915304396216385L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Li;"
+		signature = "Ld;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		signature = "(Lkl;BI)V"
+		signature = "(Lkc;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated();
@@ -43,8 +54,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt();
 		int var5 = var1.readInt();
 		this.grandExchangeOffer = new GrandExchangeOffer();
-		this.grandExchangeOffer.method110(2);
+		this.grandExchangeOffer.method139(2);
-		this.grandExchangeOffer.method117(var2);
+		this.grandExchangeOffer.method152(var2);
 		this.grandExchangeOffer.unitPrice = var4;
 		this.grandExchangeOffer.totalQuantity = var5;
 		this.grandExchangeOffer.currentQuantity = 0;
@@ -52,163 +63,50 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(I)Ljava/lang/String;",
-		garbageValue = "963027705"
+		garbageValue = "65536"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Ljava/lang/String;",
+		signature = "(S)Ljava/lang/String;",
-		garbageValue = "1720570985"
+		garbageValue = "3632"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(II)Ljava/lang/String;",
-		garbageValue = "33"
+		garbageValue = "1325412403"
 	)
-	public static void method83() {
+	static String method122(int var0) {
-		HitSplatDefinition.HitSplatDefinition_cached.clear();
+		return "<img=" + var0 + ">";
-		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear();
-		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear();
 	}
 
-	@ObfuscatedName("gj")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lbt;B)V",
+		signature = "(DDII)[D",
-		garbageValue = "76"
+		garbageValue = "-2110450939"
 	)
-	static final void method88(PendingSpawn var0) {
+	public static double[] method123(double var0, double var2, int var4) {
-		long var1 = 0L;
+		int var5 = var4 * 2 + 1;
-		int var3 = -1;
+		double[] var6 = new double[var5];
-		int var4 = 0;
+		int var7 = -var4;
-		int var5 = 0;
+
-		if (var0.type == 0) {
+		for (int var8 = 0; var7 <= var4; ++var8) {
-			var1 = PacketWriter.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
+			var6[var8] = WorldMapSection1.method636((double)var7, var0, var2);
+			++var7;
 		}
 
-		if (var0.type == 1) {
+		return var6;
-			var1 = PacketWriter.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 2) {
-			var1 = PacketWriter.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 3) {
-			var1 = PacketWriter.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (0L != var1) {
-			int var6 = PacketWriter.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1);
-			var3 = class81.Entity_unpackID(var1);
-			var4 = var6 & 31;
-			var5 = var6 >> 6 & 3;
-		}
-
-		var0.objectId = var3;
-		var0.field921 = var4;
-		var0.field922 = var5;
-	}
-
-	@ObfuscatedName("ie")
-	@ObfuscatedSignature(
-		signature = "(Lbi;IIII)V",
-		garbageValue = "1547441010"
-	)
-	@Export("addPlayerToMenu")
-	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-		if (class223.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 = class223.localPlayer.combatLevel;
-					int var9 = var8 - var7;
-					String var6;
-					if (var9 < -9) {
-						var6 = World.colorStartTag(16711680);
-					} else if (var9 < -6) {
-						var6 = World.colorStartTag(16723968);
-					} else if (var9 < -3) {
-						var6 = World.colorStartTag(16740352);
-					} else if (var9 < 0) {
-						var6 = World.colorStartTag(16756736);
-					} else if (var9 > 9) {
-						var6 = World.colorStartTag(65280);
-					} else if (var9 > 6) {
-						var6 = World.colorStartTag(4259584);
-					} else if (var9 > 3) {
-						var6 = World.colorStartTag(8453888);
-					} else if (var9 > 0) {
-						var6 = World.colorStartTag(12648192);
-					} else {
-						var6 = World.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 var10;
-				if (Client.isItemSelected == 1) {
-					WorldMapData_1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + World.colorStartTag(16777215) + var4, 14, var1, var2, var3);
-				} else if (Client.isSpellSelected) {
-					if ((ItemContainer.selectedSpellFlags & 8) == 8) {
-						WorldMapData_1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + World.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;
-								}
-
-								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class223.localPlayer.combatLevel) {
-									var11 = 2000;
-								}
-
-								if (class223.localPlayer.team != 0 && var0.team != 0) {
-									if (var0.team == class223.localPlayer.team) {
-										var11 = 2000;
-									} else {
-										var11 = 0;
-									}
-								}
-							} else if (Client.playerOptionsPriorities[var10]) {
-								var11 = 2000;
-							}
-
-							boolean var12 = false;
-							var7 = Client.playerMenuOpcodes[var10] + var11;
-							WorldMapData_1.insertMenuItemNoShift(Client.playerMenuActions[var10], World.colorStartTag(16777215) + var4, var7, var1, var2, var3);
-						}
-					}
-				}
-
-				for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
-					if (Client.menuOpcodes[var10] == 23) {
-						Client.menuTargets[var10] = World.colorStartTag(16777215) + var4;
-						break;
-					}
-				}
-
-			}
-		}
 	}
 }

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

@@ -7,22 +7,27 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("q")
+@ObfuscatedName("c")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("z")
+	@ObfuscatedName("lk")
+	@ObfuscatedSignature(
+		signature = "Lhi;"
+	)
+	static Widget field39;
+	@ObfuscatedName("a")
 	@Export("events")
 	public final List events;
 
@@ -35,7 +40,7 @@ public class GrandExchangeEvents {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkl;Z)V",
+		signature = "(Lkc;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -57,10 +62,10 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;ZI)V",
+		signature = "(Ljava/util/Comparator;ZB)V",
-		garbageValue = "663869471"
+		garbageValue = "-120"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -72,41 +77,138 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "([BZB)Ljava/lang/Object;",
+		signature = "(I)V",
-		garbageValue = "-1"
+		garbageValue = "-11933082"
 	)
-	public static Object method76(byte[] var0, boolean var1) {
+	static void method110() {
-		if (var0 == null) {
+		if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
-			return null;
+			KeyHandler.KeyHandler_keyCodes[186] = 57;
-		} else if (var0.length > 136) {
+			KeyHandler.KeyHandler_keyCodes[187] = 27;
-			DirectByteArrayCopier var2 = new DirectByteArrayCopier();
+			KeyHandler.KeyHandler_keyCodes[188] = 71;
-			var2.set(var0);
+			KeyHandler.KeyHandler_keyCodes[189] = 26;
-			return var2;
+			KeyHandler.KeyHandler_keyCodes[190] = 72;
+			KeyHandler.KeyHandler_keyCodes[191] = 73;
+			KeyHandler.KeyHandler_keyCodes[192] = 58;
+			KeyHandler.KeyHandler_keyCodes[219] = 42;
+			KeyHandler.KeyHandler_keyCodes[220] = 74;
+			KeyHandler.KeyHandler_keyCodes[221] = 43;
+			KeyHandler.KeyHandler_keyCodes[222] = 59;
+			KeyHandler.KeyHandler_keyCodes[223] = 28;
 		} else {
-			return var0;
+			KeyHandler.KeyHandler_keyCodes[44] = 71;
+			KeyHandler.KeyHandler_keyCodes[45] = 26;
+			KeyHandler.KeyHandler_keyCodes[46] = 72;
+			KeyHandler.KeyHandler_keyCodes[47] = 73;
+			KeyHandler.KeyHandler_keyCodes[59] = 57;
+			KeyHandler.KeyHandler_keyCodes[61] = 27;
+			KeyHandler.KeyHandler_keyCodes[91] = 42;
+			KeyHandler.KeyHandler_keyCodes[92] = 74;
+			KeyHandler.KeyHandler_keyCodes[93] = 43;
+			KeyHandler.KeyHandler_keyCodes[192] = 28;
+			KeyHandler.KeyHandler_keyCodes[222] = 58;
+			KeyHandler.KeyHandler_keyCodes[520] = 59;
 		}
+
 	}
 
-	@ObfuscatedName("ke")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lho;B)Lho;",
+		signature = "(IB)J",
-		garbageValue = "91"
+		garbageValue = "27"
 	)
-	static Widget method81(Widget var0) {
+	public static long method109(int var0) {
-		int var1 = UserComparator9.method3359(class2.getWidgetClickMask(var0));
+		return ViewportMouse.ViewportMouse_entityTags[var0];
-		if (var1 == 0) {
+	}
-			return null;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "83870185"
+	)
+	public static int method108(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("m")
+	@ObfuscatedSignature(
+		signature = "(IS)Lem;",
+		garbageValue = "9638"
+	)
+	@Export("getFrames")
+	static Frames getFrames(int var0) {
+		Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0);
+		if (var1 != null) {
+			return var1;
 		} else {
-			for (int var2 = 0; var2 < var1; ++var2) {
+			AbstractArchive var3 = DevicePcmPlayerProvider.SequenceDefinition_animationsArchive;
-				var0 = Canvas.getWidget(var0.parentId);
+			AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive;
-				if (var0 == null) {
+			boolean var5 = true;
-					return null;
+			int[] var6 = var3.getGroupFileIds(var0);
+
+			for (int var7 = 0; var7 < var6.length; ++var7) {
+				byte[] var8 = var3.getFile(var0, var6[var7]);
+				if (var8 == null) {
+					var5 = false;
+				} else {
+					int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
+					byte[] var10 = var4.getFile(var9, 0);
+					if (var10 == null) {
+						var5 = false;
+					}
 				}
 			}
 
-			return var0;
+			Frames var2;
+			if (!var5) {
+				var2 = null;
+			} else {
+				try {
+					var2 = new Frames(var3, var4, var0, false);
+				} catch (Exception var12) {
+					var2 = null;
+				}
+			}
+
+			if (var2 != null) {
+				SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
+			}
+
+			return var2;
+		}
+	}
+
+	@ObfuscatedName("gr")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZI)V",
+		garbageValue = "1827699856"
+	)
+	@Export("drawLoadingMessage")
+	static final void drawLoadingMessage(String var0, boolean var1) {
+		if (Client.showLoadingMessages) {
+			byte var2 = 4;
+			int var3 = var2 + 6;
+			int var4 = var2 + 6;
+			int var5 = ArchiveDiskActionHandler.fontPlain12.lineWidth(var0, 250);
+			int var6 = ArchiveDiskActionHandler.fontPlain12.lineCount(var0, 250) * 13;
+			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0);
+			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215);
+			ArchiveDiskActionHandler.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
+			class83.method2212(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var2 + var6);
+			if (var1) {
+				AbstractWorldMapData.rasterProvider.drawFull(0, 0);
+			} else {
+				WorldMapSection0.method279(var3, var4, var5, var6);
+			}
+
 		}
 	}
 }

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

@@ -1,48 +1,56 @@
-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("i")
+@ObfuscatedName("d")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("nx")
+	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
+	@Export("fontHelvetica13")
-		signature = "[Lho;"
+	static java.awt.Font fontHelvetica13;
+	@ObfuscatedName("go")
+	@ObfuscatedGetter(
+		intValue = 1997230309
 	)
-	static Widget[] field61;
+	static int field61;
-	@ObfuscatedName("z")
+	@ObfuscatedName("jo")
+	@ObfuscatedSignature(
+		signature = "Lhi;"
+	)
+	@Export("dragInventoryWidget")
+	static Widget dragInventoryWidget;
+	@ObfuscatedName("a")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 152227217
+		intValue = 517689507
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1304592967
+		intValue = 969157751
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1942003277
+		intValue = 1699214933
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 244433103
+		intValue = 573459647
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 22250551
+		intValue = 494126965
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -51,7 +59,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkl;Z)V",
+		signature = "(Lkc;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -63,42 +71,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-719257783"
+		garbageValue = "-108"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-9"
+		garbageValue = "-928896233"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IS)V",
-		garbageValue = "1269791927"
+		garbageValue = "-24365"
 	)
-	void method110(int var1) {
+	void method139(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "3"
+		garbageValue = "-268336020"
 	)
-	void method117(int var1) {
+	void method152(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -106,27 +114,158 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("gc")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
+		signature = "(II)Lcj;",
-		garbageValue = "2022647645"
+		garbageValue = "538429635"
 	)
-	static final void method129(boolean var0) {
+	@Export("getScript")
-		WorldMapID.playPcmPlayers();
+	static Script getScript(int var0) {
-		++Client.packetWriter.pendingWrites;
+		Script var1 = (Script)Script.Script_cached.get((long)var0);
-		if (Client.packetWriter.pendingWrites >= 50 || var0) {
+		if (var1 != null) {
-			Client.packetWriter.pendingWrites = 0;
+			return var1;
-			if (!Client.field730 && Client.packetWriter.getSocket() != null) {
+		} else {
-				PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher);
+			byte[] var2 = Occluder.archive12.takeFile(var0, 0);
-				Client.packetWriter.addNode(var1);
+			if (var2 == null) {
-
+				return null;
-				try {
+			} else {
-					Client.packetWriter.flush();
+				var1 = WorldMapIcon_0.newScript(var2);
-				} catch (IOException var3) {
+				Script.Script_cached.put(var1, (long)var0);
-					Client.field730 = true;
+				return var1;
-				}
 			}
+		}
+	}
 
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;II[BIB)I",
+		garbageValue = "-73"
+	)
+	@Export("encodeStringCp1252")
+	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
+		int var5 = var2 - var1;
+
+		for (int var6 = 0; var6 < var5; ++var6) {
+			char var7 = var0.charAt(var6 + var1);
+			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
+				var3[var6 + var4] = (byte)var7;
+			} else if (var7 == 8364) {
+				var3[var6 + var4] = -128;
+			} else if (var7 == 8218) {
+				var3[var6 + var4] = -126;
+			} else if (var7 == 402) {
+				var3[var6 + var4] = -125;
+			} else if (var7 == 8222) {
+				var3[var6 + var4] = -124;
+			} else if (var7 == 8230) {
+				var3[var6 + var4] = -123;
+			} else if (var7 == 8224) {
+				var3[var6 + var4] = -122;
+			} else if (var7 == 8225) {
+				var3[var6 + var4] = -121;
+			} else if (var7 == 710) {
+				var3[var6 + var4] = -120;
+			} else if (var7 == 8240) {
+				var3[var6 + var4] = -119;
+			} else if (var7 == 352) {
+				var3[var6 + var4] = -118;
+			} else if (var7 == 8249) {
+				var3[var6 + var4] = -117;
+			} else if (var7 == 338) {
+				var3[var6 + var4] = -116;
+			} else if (var7 == 381) {
+				var3[var6 + var4] = -114;
+			} else if (var7 == 8216) {
+				var3[var6 + var4] = -111;
+			} else if (var7 == 8217) {
+				var3[var6 + var4] = -110;
+			} else if (var7 == 8220) {
+				var3[var6 + var4] = -109;
+			} else if (var7 == 8221) {
+				var3[var6 + var4] = -108;
+			} else if (var7 == 8226) {
+				var3[var6 + var4] = -107;
+			} else if (var7 == 8211) {
+				var3[var6 + var4] = -106;
+			} else if (var7 == 8212) {
+				var3[var6 + var4] = -105;
+			} else if (var7 == 732) {
+				var3[var6 + var4] = -104;
+			} else if (var7 == 8482) {
+				var3[var6 + var4] = -103;
+			} else if (var7 == 353) {
+				var3[var6 + var4] = -102;
+			} else if (var7 == 8250) {
+				var3[var6 + var4] = -101;
+			} else if (var7 == 339) {
+				var3[var6 + var4] = -100;
+			} else if (var7 == 382) {
+				var3[var6 + var4] = -98;
+			} else if (var7 == 376) {
+				var3[var6 + var4] = -97;
+			} else {
+				var3[var6 + var4] = 63;
+			}
+		}
+
+		return var5;
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "-1089712950"
+	)
+	@Export("setLoginResponseString")
+	static void setLoginResponseString(String var0, String var1, String var2) {
+		Login.Login_response1 = var0;
+		Login.Login_response2 = var1;
+		Login.Login_response3 = var2;
+	}
+
+	@ObfuscatedName("jm")
+	@ObfuscatedSignature(
+		signature = "(III)Ljava/lang/String;",
+		garbageValue = "76295628"
+	)
+	static final String method159(int var0, int var1) {
+		int var2 = var1 - var0;
+		if (var2 < -9) {
+			return AbstractArchive.colorStartTag(16711680);
+		} else if (var2 < -6) {
+			return AbstractArchive.colorStartTag(16723968);
+		} else if (var2 < -3) {
+			return AbstractArchive.colorStartTag(16740352);
+		} else if (var2 < 0) {
+			return AbstractArchive.colorStartTag(16756736);
+		} else if (var2 > 9) {
+			return AbstractArchive.colorStartTag(65280);
+		} else if (var2 > 6) {
+			return AbstractArchive.colorStartTag(4259584);
+		} else if (var2 > 3) {
+			return AbstractArchive.colorStartTag(8453888);
+		} else {
+			return var2 > 0 ? AbstractArchive.colorStartTag(12648192) : AbstractArchive.colorStartTag(16776960);
+		}
+	}
+
+	@ObfuscatedName("jq")
+	@ObfuscatedSignature(
+		signature = "(II)Ljava/lang/String;",
+		garbageValue = "354835371"
+	)
+	@Export("formatItemStacks")
+	static final String formatItemStacks(int var0) {
+		String var1 = Integer.toString(var0);
+
+		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
+			var1 = var1.substring(0, var2) + "," + var1.substring(var2);
+		}
+
+		if (var1.length() > 9) {
+			return " " + AbstractArchive.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
+		} else {
+			return var1.length() > 6 ? " " + AbstractArchive.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + AbstractArchive.colorStartTag(16776960) + var1 + "</col>";
 		}
 	}
 }

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

@@ -1,43 +1,26 @@
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.Comparator;
-import java.util.Random;
+import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("o")
+@ObfuscatedName("h")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("pq")
+	@ObfuscatedName("hk")
-	@Export("ClanChat_inClanChat")
+	@ObfuscatedGetter(
-	static boolean ClanChat_inClanChat;
+		intValue = -1448356175
+	)
+	@Export("cameraZ")
+	static int cameraZ;
+
 	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lho;"
+		signature = "(Lo;Lo;B)I",
-	)
+		garbageValue = "46"
-	static Widget field76;
-	@ObfuscatedName("di")
-	@ObfuscatedSignature(
-		signature = "Lie;"
-	)
-	@Export("archive4")
-	static Archive archive4;
-	@ObfuscatedName("do")
-	@ObfuscatedSignature(
-		signature = "Lie;"
-	)
-	@Export("archive8")
-	static Archive archive8;
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(Lm;Lm;B)I",
-		garbageValue = "24"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -52,691 +35,215 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Lbi;I)V",
-		garbageValue = "-72081221"
+		garbageValue = "-794060784"
 	)
-	static void method167() {
+	@Export("runScriptEvent")
-		Login.Login_username = Login.Login_username.trim();
+	public static void runScriptEvent(ScriptEvent var0) {
-		if (Login.Login_username.length() == 0) {
+		class4.runScript(var0, 500000);
-			PlayerType.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "(IIIII)I",
+		garbageValue = "1637402959"
+	)
+	static final int method195(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);
+	}
+
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		signature = "(ILcj;ZB)I",
+		garbageValue = "88"
+	)
+	static int method196(int var0, Script var1, boolean var2) {
+		String var3;
+		int var4;
+		if (var0 == ScriptOpcodes.APPEND_NUM) {
+			var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+			var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3 + var4;
+			return 1;
 		} else {
-			long var1;
+			String var9;
-			try {
+			if (var0 == ScriptOpcodes.APPEND) {
-				URL var3 = new URL(FaceNormal.method3229("services", false) + "m=accountappeal/login.ws");
+				WorldMapDecoration.Interpreter_stringStackSize -= 2;
-				URLConnection var4 = var3.openConnection();
+				var3 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize];
-				var4.setRequestProperty("connection", "close");
+				var9 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize + 1];
-				var4.setDoInput(true);
+				Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3 + var9;
-				var4.setDoOutput(true);
+				return 1;
-				var4.setConnectTimeout(5000);
+			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) {
-				OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream());
+				var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
-				var5.write("data1=req");
+				var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				var5.flush();
+				Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3 + WorldMapData_0.intToString(var4, true);
-				InputStream var6 = var4.getInputStream();
+				return 1;
-				Buffer var7 = new Buffer(new byte[1000]);
+			} else if (var0 == ScriptOpcodes.LOWERCASE) {
-
+				var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
-				while (true) {
+				Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.toLowerCase();
-					int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset);
+				return 1;
-					if (var8 == -1) {
-						var7.offset = 0;
-						long var31 = var7.readLong();
-						var1 = var31;
-						break;
-					}
-
-					var7.offset += var8;
-					if (var7.offset >= 1000) {
-						var1 = 0L;
-						break;
-					}
-				}
-			} catch (Exception var46) {
-				var1 = 0L;
-			}
-
-			byte var0;
-			if (0L == var1) {
-				var0 = 5;
 			} else {
-				String var47 = Login.Login_username;
+				int var6;
-				Random var48 = new Random();
+				int var10;
-				Buffer var35 = new Buffer(128);
+				if (var0 == ScriptOpcodes.FROMDATE) {
-				Buffer var9 = new Buffer(128);
+					var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				int[] var10 = new int[]{var48.nextInt(), var48.nextInt(), (int)(var1 >> 32), (int)var1};
+					long var11 = (11745L + (long)var10) * 86400000L;
-				var35.writeByte(10);
+					Interpreter.Interpreter_calendar.setTime(new Date(var11));
+					var6 = Interpreter.Interpreter_calendar.get(5);
+					int var16 = Interpreter.Interpreter_calendar.get(2);
+					int var8 = Interpreter.Interpreter_calendar.get(1);
+					Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8;
+					return 1;
+				} else if (var0 != ScriptOpcodes.TEXT_GENDER) {
+					if (var0 == ScriptOpcodes.TOSTRING) {
+						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = Integer.toString(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.COMPARE) {
+						WorldMapDecoration.Interpreter_stringStackSize -= 2;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class326.method6375(ArchiveDiskAction.compareStrings(Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize + 1], WorldMapSection1.clientLanguage));
+						return 1;
+					} else {
+						int var5;
+						byte[] var13;
+						Font var14;
+						if (var0 == ScriptOpcodes.PARAHEIGHT) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+							Interpreter.Interpreter_intStackSize -= 2;
+							var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							var13 = UrlRequest.archive13.takeFile(var5, 0);
+							var14 = new Font(var13);
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4);
+							return 1;
+						} else if (var0 == ScriptOpcodes.PARAWIDTH) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+							Interpreter.Interpreter_intStackSize -= 2;
+							var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							var13 = UrlRequest.archive13.takeFile(var5, 0);
+							var14 = new Font(var13);
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4);
+							return 1;
+						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) {
+							WorldMapDecoration.Interpreter_stringStackSize -= 2;
+							var3 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize];
+							var9 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize + 1];
+							if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) {
+								Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3;
+							} else {
+								Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var9;
+							}
 
-				int var11;
+							return 1;
-				for (var11 = 0; var11 < 4; ++var11) {
+						} else if (var0 == ScriptOpcodes.ESCAPE) {
-					var35.writeInt(var48.nextInt());
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
-				}
+							Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3);
+							return 1;
+						} else if (var0 == ScriptOpcodes.APPEND_CHAR) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+							var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3 + (char)var4;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) {
+							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapElement.isCharPrintable((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) {
+							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator8.isAlphaNumeric((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) {
+							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ChatChannel.isCharAlphabetic((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) {
+							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.isDigit((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.STRING_LENGTH) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+							if (var3 != null) {
+								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length();
+							} else {
+								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+							}
 
-				var35.writeInt(var10[0]);
+							return 1;
-				var35.writeInt(var10[1]);
+						} else if (var0 == ScriptOpcodes.SUBSTRING) {
-				var35.writeLong(var1);
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
-				var35.writeLong(0L);
+							Interpreter.Interpreter_intStackSize -= 2;
+							var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+							var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+							Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.substring(var4, var5);
+							return 1;
+						} else if (var0 == ScriptOpcodes.REMOVETAGS) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+							StringBuilder var17 = new StringBuilder(var3.length());
+							boolean var15 = false;
 
-				for (var11 = 0; var11 < 4; ++var11) {
+							for (var6 = 0; var6 < var3.length(); ++var6) {
-					var35.writeInt(var48.nextInt());
+								char var7 = var3.charAt(var6);
-				}
+								if (var7 == '<') {
+									var15 = true;
+								} else if (var7 == '>') {
+									var15 = false;
+								} else if (!var15) {
+									var17.append(var7);
+								}
+							}
 
-				var35.encryptRsa(class80.field1119, class80.field1120);
+							Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var17.toString();
-				var9.writeByte(10);
+							return 1;
-
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) {
-				for (var11 = 0; var11 < 3; ++var11) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
-					var9.writeInt(var48.nextInt());
+							var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				}
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4);
-
+							return 1;
-				var9.writeLong(var48.nextLong());
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) {
-				var9.writeLongMedium(var48.nextLong());
+							WorldMapDecoration.Interpreter_stringStackSize -= 2;
-				if (Client.randomDatData != null) {
+							var3 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize];
-					var9.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
+							var9 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize + 1];
+							var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5);
+							return 1;
+						} else if (var0 == ScriptOpcodes.UPPERCASE) {
+							var3 = Interpreter.Interpreter_stringStack[--WorldMapDecoration.Interpreter_stringStackSize];
+							Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3.toUpperCase();
+							return 1;
+						} else {
+							return 2;
+						}
+					}
 				} else {
-					byte[] var12 = new byte[24];
+					WorldMapDecoration.Interpreter_stringStackSize -= 2;
-
+					var3 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize];
-					try {
+					var9 = Interpreter.Interpreter_stringStack[WorldMapDecoration.Interpreter_stringStackSize + 1];
-						JagexCache.JagexCache_randomDat.seek(0L);
+					if (class215.localPlayer.appearance != null && class215.localPlayer.appearance.isFemale) {
-						JagexCache.JagexCache_randomDat.readFully(var12);
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var9;
-
-						int var13;
-						for (var13 = 0; var13 < 24 && var12[var13] == 0; ++var13) {
-						}
-
-						if (var13 >= 24) {
-							throw new IOException();
-						}
-					} catch (Exception var45) {
-						for (int var14 = 0; var14 < 24; ++var14) {
-							var12[var14] = -1;
-						}
-					}
-
-					var9.writeBytes(var12, 0, var12.length);
-				}
-
-				var9.writeLong(var48.nextLong());
-				var9.encryptRsa(class80.field1119, class80.field1120);
-				var11 = class268.stringCp1252NullTerminatedByteSize(var47);
-				if (var11 % 8 != 0) {
-					var11 += 8 - var11 % 8;
-				}
-
-				Buffer var49 = new Buffer(var11);
-				var49.writeStringCp1252NullTerminated(var47);
-				var49.offset = var11;
-				var49.xteaEncryptAll(var10);
-				Buffer var36 = new Buffer(var49.offset + var35.offset + var9.offset + 5);
-				var36.writeByte(2);
-				var36.writeByte(var35.offset);
-				var36.writeBytes(var35.array, 0, var35.offset);
-				var36.writeByte(var9.offset);
-				var36.writeBytes(var9.array, 0, var9.offset);
-				var36.writeShort(var49.offset);
-				var36.writeBytes(var49.array, 0, var49.offset);
-				byte[] var15 = var36.array;
-				String var38 = class3.method52(var15, 0, var15.length);
-				String var16 = var38;
-
-				byte var43;
-				try {
-					URL var17 = new URL(FaceNormal.method3229("services", false) + "m=accountappeal/login.ws");
-					URLConnection var18 = var17.openConnection();
-					var18.setDoInput(true);
-					var18.setDoOutput(true);
-					var18.setConnectTimeout(5000);
-					OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream());
-					int var22 = var16.length();
-					StringBuilder var23 = new StringBuilder(var22);
-
-					int var27;
-					for (int var24 = 0; var24 < var22; ++var24) {
-						char var25 = var16.charAt(var24);
-						if ((var25 < 'a' || var25 > 'z') && (var25 < 'A' || var25 > 'Z') && (var25 < '0' || var25 > '9') && var25 != '.' && var25 != '-' && var25 != '*' && var25 != '_') {
-							if (var25 == ' ') {
-								var23.append('+');
-							} else {
-								byte var26 = Entity.charToByteCp1252(var25);
-								var23.append('%');
-								var27 = var26 >> 4 & 15;
-								if (var27 >= 10) {
-									var23.append((char)(var27 + 55));
-								} else {
-									var23.append((char)(var27 + 48));
-								}
-
-								var27 = var26 & 15;
-								if (var27 >= 10) {
-									var23.append((char)(var27 + 55));
-								} else {
-									var23.append((char)(var27 + 48));
-								}
-							}
-						} else {
-							var23.append(var25);
-						}
-					}
-
-					String var21 = var23.toString();
-					String var50 = "data2=" + var21 + "&dest=";
-					int var51 = "passwordchoice.ws".length();
-					StringBuilder var40 = new StringBuilder(var51);
-
-					for (var27 = 0; var27 < var51; ++var27) {
-						char var28 = "passwordchoice.ws".charAt(var27);
-						if ((var28 < 'a' || var28 > 'z') && (var28 < 'A' || var28 > 'Z') && (var28 < '0' || var28 > '9') && var28 != '.' && var28 != '-' && var28 != '*' && var28 != '_') {
-							if (var28 == ' ') {
-								var40.append('+');
-							} else {
-								byte var29 = Entity.charToByteCp1252(var28);
-								var40.append('%');
-								int var30 = var29 >> 4 & 15;
-								if (var30 >= 10) {
-									var40.append((char)(var30 + 55));
-								} else {
-									var40.append((char)(var30 + 48));
-								}
-
-								var30 = var29 & 15;
-								if (var30 >= 10) {
-									var40.append((char)(var30 + 55));
-								} else {
-									var40.append((char)(var30 + 48));
-								}
-							}
-						} else {
-							var40.append(var28);
-						}
-					}
-
-					String var41 = var40.toString();
-					var19.write(var50 + var41);
-					var19.flush();
-					InputStream var42 = var18.getInputStream();
-					var36 = new Buffer(new byte[1000]);
-
-					while (true) {
-						int var52 = var42.read(var36.array, var36.offset, 1000 - var36.offset);
-						if (var52 == -1) {
-							var19.close();
-							var42.close();
-							String var53 = new String(var36.array);
-							if (var53.startsWith("OFFLINE")) {
-								var43 = 4;
-							} else if (var53.startsWith("WRONG")) {
-								var43 = 7;
-							} else if (var53.startsWith("RELOAD")) {
-								var43 = 3;
-							} else if (var53.startsWith("Not permitted for social network accounts.")) {
-								var43 = 6;
-							} else {
-								var36.xteaDecryptAll(var10);
-
-								while (var36.offset > 0 && var36.array[var36.offset - 1] == 0) {
-									--var36.offset;
-								}
-
-								var53 = new String(var36.array, 0, var36.offset);
-								if (LoginScreenAnimation.isValidURL(var53)) {
-									ArchiveDiskActionHandler.openURL(var53, true, false);
-									var43 = 2;
-								} else {
-									var43 = 5;
-								}
-							}
-							break;
-						}
-
-						var36.offset += var52;
-						if (var36.offset >= 1000) {
-							var43 = 5;
-							break;
-						}
-					}
-				} catch (Throwable var44) {
-					var44.printStackTrace();
-					var43 = 5;
-				}
-
-				var0 = var43;
-			}
-
-			switch(var0) {
-			case 2:
-				PlayerType.setLoginResponseString(Strings.field3008, Strings.field3009, Strings.field3010);
-				Login.loginIndex = 6;
-				break;
-			case 3:
-				PlayerType.setLoginResponseString("", "Error connecting to server.", "");
-				break;
-			case 4:
-				PlayerType.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later.");
-				break;
-			case 5:
-				PlayerType.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later.");
-				break;
-			case 6:
-				PlayerType.setLoginResponseString("", "Error connecting to server.", "");
-				break;
-			case 7:
-				PlayerType.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
-			}
-
-		}
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(IIIIIILex;Lfa;I)V",
-		garbageValue = "2071227561"
-	)
-	static final void method165(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
-			if (var0 < Tiles.Tiles_minPlane) {
-				Tiles.Tiles_minPlane = var0;
-			}
-
-			ObjectDefinition var8 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(var3);
-			int var9;
-			int var10;
-			if (var4 != 1 && var4 != 3) {
-				var9 = var8.sizeX;
-				var10 = var8.sizeY;
-			} else {
-				var9 = var8.sizeY;
-				var10 = var8.sizeX;
-			}
-
-			int var11;
-			int var12;
-			if (var9 + var1 <= 104) {
-				var11 = (var9 >> 1) + var1;
-				var12 = (var9 + 1 >> 1) + var1;
-			} else {
-				var11 = var1;
-				var12 = var1 + 1;
-			}
-
-			int var13;
-			int var14;
-			if (var10 + var2 <= 104) {
-				var13 = (var10 >> 1) + var2;
-				var14 = var2 + (var10 + 1 >> 1);
-			} else {
-				var13 = var2;
-				var14 = var2 + 1;
-			}
-
-			int[][] var15 = Tiles.Tiles_heights[var0];
-			int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2;
-			int var17 = (var1 << 7) + (var9 << 6);
-			int var18 = (var2 << 7) + (var10 << 6);
-			long var19 = class267.calculateTag(var1, var2, 2, var8.int1 == 0, var3);
-			int var21 = var5 + (var4 << 6);
-			if (var8.int3 == 1) {
-				var21 += 256;
-			}
-
-			int var23;
-			int var24;
-			if (var8.hasSound()) {
-				ObjectSound var22 = new ObjectSound();
-				var22.plane = var0;
-				var22.x = var1 * 128;
-				var22.y = var2 * 16384;
-				var23 = var8.sizeX;
-				var24 = var8.sizeY;
-				if (var4 == 1 || var4 == 3) {
-					var23 = var8.sizeY;
-					var24 = var8.sizeX;
-				}
-
-				var22.field1059 = (var23 + var1) * 16384;
-				var22.field1060 = (var24 + var2) * 16384;
-				var22.soundEffectId = var8.ambientSoundId;
-				var22.field1061 = var8.int4 * 128;
-				var22.field1064 = var8.int5;
-				var22.field1070 = var8.int6;
-				var22.soundEffectIds = var8.soundEffectIds;
-				if (var8.transforms != null) {
-					var22.obj = var8;
-					var22.set();
-				}
-
-				ObjectSound.objectSounds.addFirst(var22);
-				if (var22.soundEffectIds != null) {
-					var22.field1067 = var22.field1064 + (int)(Math.random() * (double)(var22.field1070 - var22.field1064));
-				}
-			}
-
-			Object var34;
-			if (var5 == 22) {
-				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
-					if (var8.animationId == -1 && var8.transforms == null) {
-						var34 = var8.getEntity(22, var4, var15, var17, var16, var18);
 					} else {
-						var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+						Interpreter.Interpreter_stringStack[++WorldMapDecoration.Interpreter_stringStackSize - 1] = var3;
-					}
-
-					var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21);
-					if (var8.interactType == 1 && var7 != null) {
-						var7.setBlockedByFloorDec(var1, var2);
 					}
 
+					return 1;
 				}
-			} else if (var5 != 10 && var5 != 11) {
-				int[] var10000;
-				if (var5 >= 12) {
-					if (var8.animationId == -1 && var8.transforms == null) {
-						var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-					} else {
-						var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-					}
-
-					var6.method3056(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
-					if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
-						var10000 = Tiles.field488[var0][var1];
-						var10000[var2] |= 2340;
-					}
-
-					if (var8.interactType != 0 && var7 != null) {
-						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-					}
-
-				} else if (var5 == 0) {
-					if (var8.animationId == -1 && var8.transforms == null) {
-						var34 = var8.getEntity(0, var4, var15, var17, var16, var18);
-					} else {
-						var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-					}
-
-					var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field489[var4], 0, var19, var21);
-					if (var4 == 0) {
-						if (var8.clipped) {
-							Tiles.field486[var0][var1][var2] = 50;
-							Tiles.field486[var0][var1][var2 + 1] = 50;
-						}
-
-						if (var8.modelClipped) {
-							var10000 = Tiles.field488[var0][var1];
-							var10000[var2] |= 585;
-						}
-					} else if (var4 == 1) {
-						if (var8.clipped) {
-							Tiles.field486[var0][var1][var2 + 1] = 50;
-							Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
-						}
-
-						if (var8.modelClipped) {
-							var10000 = Tiles.field488[var0][var1];
-							var10000[var2 + 1] |= 1170;
-						}
-					} else if (var4 == 2) {
-						if (var8.clipped) {
-							Tiles.field486[var0][var1 + 1][var2] = 50;
-							Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
-						}
-
-						if (var8.modelClipped) {
-							var10000 = Tiles.field488[var0][var1 + 1];
-							var10000[var2] |= 585;
-						}
-					} else if (var4 == 3) {
-						if (var8.clipped) {
-							Tiles.field486[var0][var1][var2] = 50;
-							Tiles.field486[var0][var1 + 1][var2] = 50;
-						}
-
-						if (var8.modelClipped) {
-							var10000 = Tiles.field488[var0][var1];
-							var10000[var2] |= 1170;
-						}
-					}
-
-					if (var8.interactType != 0 && var7 != null) {
-						var7.method3508(var1, var2, var5, var4, var8.boolean1);
-					}
-
-					if (var8.int2 != 16) {
-						var6.method3127(var0, var1, var2, var8.int2);
-					}
-
-				} else if (var5 == 1) {
-					if (var8.animationId == -1 && var8.transforms == null) {
-						var34 = var8.getEntity(1, var4, var15, var17, var16, var18);
-					} else {
-						var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-					}
-
-					var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field493[var4], 0, var19, var21);
-					if (var8.clipped) {
-						if (var4 == 0) {
-							Tiles.field486[var0][var1][var2 + 1] = 50;
-						} else if (var4 == 1) {
-							Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
-						} else if (var4 == 2) {
-							Tiles.field486[var0][var1 + 1][var2] = 50;
-						} else if (var4 == 3) {
-							Tiles.field486[var0][var1][var2] = 50;
-						}
-					}
-
-					if (var8.interactType != 0 && var7 != null) {
-						var7.method3508(var1, var2, var5, var4, var8.boolean1);
-					}
-
-				} else {
-					int var28;
-					if (var5 == 2) {
-						var28 = var4 + 1 & 3;
-						Object var29;
-						Object var30;
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18);
-							var30 = var8.getEntity(2, var28, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field489[var4], Tiles.field489[var28], var19, var21);
-						if (var8.modelClipped) {
-							if (var4 == 0) {
-								var10000 = Tiles.field488[var0][var1];
-								var10000[var2] |= 585;
-								var10000 = Tiles.field488[var0][var1];
-								var10000[1 + var2] |= 1170;
-							} else if (var4 == 1) {
-								var10000 = Tiles.field488[var0][var1];
-								var10000[var2 + 1] |= 1170;
-								var10000 = Tiles.field488[var0][var1 + 1];
-								var10000[var2] |= 585;
-							} else if (var4 == 2) {
-								var10000 = Tiles.field488[var0][var1 + 1];
-								var10000[var2] |= 585;
-								var10000 = Tiles.field488[var0][var1];
-								var10000[var2] |= 1170;
-							} else if (var4 == 3) {
-								var10000 = Tiles.field488[var0][var1];
-								var10000[var2] |= 1170;
-								var10000 = Tiles.field488[var0][var1];
-								var10000[var2] |= 585;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) {
-							var7.method3508(var1, var2, var5, var4, var8.boolean1);
-						}
-
-						if (var8.int2 != 16) {
-							var6.method3127(var0, var1, var2, var8.int2);
-						}
-
-					} else if (var5 == 3) {
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var34 = var8.getEntity(3, var4, var15, var17, var16, var18);
-						} else {
-							var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field493[var4], 0, var19, var21);
-						if (var8.clipped) {
-							if (var4 == 0) {
-								Tiles.field486[var0][var1][var2 + 1] = 50;
-							} else if (var4 == 1) {
-								Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
-							} else if (var4 == 2) {
-								Tiles.field486[var0][var1 + 1][var2] = 50;
-							} else if (var4 == 3) {
-								Tiles.field486[var0][var1][var2] = 50;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) {
-							var7.method3508(var1, var2, var5, var4, var8.boolean1);
-						}
-
-					} else if (var5 == 9) {
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-						} else {
-							var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.method3056(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
-						if (var8.interactType != 0 && var7 != null) {
-							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-						}
-
-						if (var8.int2 != 16) {
-							var6.method3127(var0, var1, var2, var8.int2);
-						}
-
-					} else if (var5 == 4) {
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var34 = var8.getEntity(4, var4, var15, var17, var16, var18);
-						} else {
-							var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field489[var4], 0, 0, 0, var19, var21);
-					} else {
-						long var31;
-						Object var33;
-						if (var5 == 5) {
-							var28 = 16;
-							var31 = var6.getBoundaryObjectTag(var0, var1, var2);
-							if (0L != var31) {
-								var28 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(class81.Entity_unpackID(var31)).int2;
-							}
-
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var33 = var8.getEntity(4, var4, var15, var17, var16, var18);
-							} else {
-								var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field489[var4], 0, var28 * Tiles.field491[var4], var28 * Tiles.field492[var4], var19, var21);
-						} else if (var5 == 6) {
-							var28 = 8;
-							var31 = var6.getBoundaryObjectTag(var0, var1, var2);
-							if (0L != var31) {
-								var28 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(class81.Entity_unpackID(var31)).int2 / 2;
-							}
-
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
-							} else {
-								var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field484[var4], var28 * Tiles.field494[var4], var19, var21);
-						} else if (var5 == 7) {
-							var23 = var4 + 2 & 3;
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
-							} else {
-								var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21);
-						} else if (var5 == 8) {
-							var28 = 8;
-							var31 = var6.getBoundaryObjectTag(var0, var1, var2);
-							if (0L != var31) {
-								var28 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(class81.Entity_unpackID(var31)).int2 / 2;
-							}
-
-							int var27 = var4 + 2 & 3;
-							Object var26;
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
-								var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18);
-							} else {
-								var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-								var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field484[var4], var28 * Tiles.field494[var4], var19, var21);
-						}
-					}
-				}
-			} else {
-				if (var8.animationId == -1 && var8.transforms == null) {
-					var34 = var8.getEntity(10, var4, var15, var17, var16, var18);
-				} else {
-					var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-				}
-
-				if (var34 != null && var6.method3056(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
-					var23 = 15;
-					if (var34 instanceof Model) {
-						var23 = ((Model)var34).method2859() / 4;
-						if (var23 > 30) {
-							var23 = 30;
-						}
-					}
-
-					for (var24 = 0; var24 <= var9; ++var24) {
-						for (int var25 = 0; var25 <= var10; ++var25) {
-							if (var23 > Tiles.field486[var0][var24 + var1][var25 + var2]) {
-								Tiles.field486[var0][var24 + var1][var25 + var2] = (byte)var23;
-							}
-						}
-					}
-				}
-
-				if (var8.interactType != 0 && var7 != null) {
-					var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-				}
-
 			}
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("kq")
 	@ObfuscatedSignature(
-		signature = "(IIII)I",
+		signature = "(Lhi;I)V",
-		garbageValue = "1521796882"
+		garbageValue = "-1910417202"
 	)
-	@Export("hslToRgb")
+	@Export("invalidateWidget")
-	static final int hslToRgb(int var0, int var1, int var2) {
+	static void invalidateWidget(Widget var0) {
-		if (var2 > 179) {
+		if (var0.cycle == Client.field835) {
-			var1 /= 2;
+			Client.field842[var0.rootIndex] = true;
 		}
 
-		if (var2 > 192) {
-			var1 /= 2;
-		}
-
-		if (var2 > 217) {
-			var1 /= 2;
-		}
-
-		if (var2 > 243) {
-			var1 /= 2;
-		}
-
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
-		return var3;
 	}
 }

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

@@ -1,24 +1,17 @@
+import java.io.IOException;
 import java.util.Comparator;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("b")
+@ObfuscatedName("p")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "(Lo;Lo;I)I",
-	)
+		garbageValue = "1525556475"
-	static AbstractArchive field66;
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(Lm;Lm;I)I",
-		garbageValue = "1692871938"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -33,97 +26,343 @@ final class GrandExchangeOfferNameComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lhp;I)V",
+		signature = "(Lhq;Lhq;B)I",
-		garbageValue = "1206640259"
+		garbageValue = "75"
 	)
-	public static void method153(AbstractArchive var0) {
+	static int method182(AbstractArchive var0, AbstractArchive var1) {
-		VarbitDefinition.VarbitDefinition_archive = var0;
+		int var2 = 0;
+		if (var0.tryLoadFileByNames("title.jpg", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("logo", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("logo_deadman_mode", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("logo_seasonal_mode", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("titlebox", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("titlebutton", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("runes", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("title_mute", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) {
+			++var2;
+		}
+
+		var1.tryLoadFileByNames("sl_back", "");
+		var1.tryLoadFileByNames("sl_flags", "");
+		var1.tryLoadFileByNames("sl_arrows", "");
+		var1.tryLoadFileByNames("sl_stars", "");
+		var1.tryLoadFileByNames("sl_button", "");
+		return var2;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("ha")
 	@ObfuscatedSignature(
-		signature = "([Ljava/lang/String;[SIIB)V",
+		signature = "(IIIIIIII)V",
-		garbageValue = "-18"
+		garbageValue = "-1414450696"
 	)
-	@Export("sortItemsByName")
+	static final void method183(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-	public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
+		var5 = PcmPlayer.method2637(var5, var6);
-		if (var2 < var3) {
+		int var7 = 2048 - var3 & 2047;
-			int var4 = (var3 + var2) / 2;
+		int var8 = 2048 - var4 & 2047;
-			int var5 = var2;
+		int var9 = 0;
-			String var6 = var0[var4];
+		int var10 = 0;
-			var0[var4] = var0[var3];
+		int var11 = var5;
-			var0[var3] = var6;
+		int var12;
-			short var7 = var1[var4];
+		int var13;
-			var1[var4] = var1[var3];
+		int var14;
-			var1[var3] = var7;
+		if (var7 != 0) {
+			var12 = Rasterizer3D.Rasterizer3D_sine[var7];
+			var13 = Rasterizer3D.Rasterizer3D_cosine[var7];
+			var14 = var10 * var13 - var12 * var5 >> 16;
+			var11 = var13 * var5 + var12 * var10 >> 16;
+			var10 = var14;
+		}
 
-			for (int var8 = var2; var8 < var3; ++var8) {
+		if (var8 != 0) {
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
+			var12 = Rasterizer3D.Rasterizer3D_sine[var8];
-					String var9 = var0[var8];
+			var13 = Rasterizer3D.Rasterizer3D_cosine[var8];
-					var0[var8] = var0[var5];
+			var14 = var13 * var9 + var11 * var12 >> 16;
-					var0[var5] = var9;
+			var11 = var13 * var11 - var9 * var12 >> 16;
-					short var10 = var1[var8];
+			var9 = var14;
-					var1[var8] = var1[var5];
+		}
-					var1[var5++] = var10;
-				}
-			}
 
-			var0[var3] = var0[var5];
+		UrlRequester.cameraX = var0 - var9;
-			var0[var5] = var6;
+		class16.cameraY = var1 - var10;
-			var1[var3] = var1[var5];
+		GrandExchangeOfferAgeComparator.cameraZ = var2 - var11;
-			var1[var5] = var7;
+		class247.cameraPitch = var3;
-			sortItemsByName(var0, var1, var2, var5 - 1);
+		WorldMapData_1.cameraYaw = var4;
-			sortItemsByName(var0, var1, var5 + 1, var3);
+		if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (IgnoreList.oculusOrbFocalPointX >> 7 != class215.localPlayer.x >> 7 || AbstractArchive.oculusOrbFocalPointY >> 7 != class215.localPlayer.y >> 7)) {
+			var12 = class215.localPlayer.Scene_plane;
+			var13 = UserComparator8.baseX * 64 + (IgnoreList.oculusOrbFocalPointX >> 7);
+			var14 = HealthBar.baseY * 64 + (AbstractArchive.oculusOrbFocalPointY >> 7);
+			PacketBufferNode var15 = SoundSystem.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher);
+			var15.packetBuffer.writeIntME(Client.field799);
+			var15.packetBuffer.writeByte(var12);
+			var15.packetBuffer.method5644(var14);
+			var15.packetBuffer.writeShortLE(var13);
+			Client.packetWriter.addNode(var15);
 		}
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("hz")
 	@ObfuscatedSignature(
-		signature = "(Lfm;III)Ldv;",
+		signature = "(ZI)V",
-		garbageValue = "-1644992820"
+		garbageValue = "-604205678"
 	)
-	public static final PcmPlayer method151(TaskHandler var0, int var1, int var2) {
+	static final void method172(boolean var0) {
-		if (UrlRequest.PcmPlayer_sampleRate == 0) {
+		ChatChannel.playPcmPlayers();
-			throw new IllegalStateException();
+		++Client.packetWriter.pendingWrites;
-		} else if (var1 >= 0 && var1 < 2) {
+		if (Client.packetWriter.pendingWrites >= 50 || var0) {
-			if (var2 < 256) {
+			Client.packetWriter.pendingWrites = 0;
-				var2 = 256;
+			if (!Client.field680 && Client.packetWriter.getSocket() != null) {
+				PacketBufferNode var1 = SoundSystem.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher);
+				Client.packetWriter.addNode(var1);
+
+				try {
+					Client.packetWriter.flush();
+				} catch (IOException var3) {
+					Client.field680 = true;
+				}
 			}
 
-			try {
+		}
-				PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player();
+	}
-				var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
-				var3.field1391 = var2;
-				var3.init();
-				var3.capacity = (var2 & -1024) + 1024;
-				if (var3.capacity > 16384) {
-					var3.capacity = 16384;
-				}
 
-				var3.open(var3.capacity);
+	@ObfuscatedName("is")
-				if (MenuAction.PcmPlayer_count > 0 && RunException.soundSystem == null) {
+	@ObfuscatedSignature(
-					RunException.soundSystem = new SoundSystem();
+		signature = "(IIIIB)V",
-					PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1);
+		garbageValue = "-93"
-					PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(RunException.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
+	)
-				}
+	@Export("addSceneMenuOptions")
+	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+		if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
+			GameObject.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
+		}
 
-				if (RunException.soundSystem != null) {
+		long var4 = -1L;
-					if (RunException.soundSystem.players[var1] != null) {
+		long var6 = -1L;
-						throw new IllegalArgumentException();
+
+		int var8;
+		for (var8 = 0; var8 < WorldMapLabel.method479(); ++var8) {
+			long var9 = GrandExchangeEvents.method109(var8);
+			if (var6 != var9) {
+				var6 = var9;
+				long var13 = ViewportMouse.ViewportMouse_entityTags[var8];
+				int var24 = (int)(var13 >>> 0 & 127L);
+				var24 = var24;
+				long var15 = ViewportMouse.ViewportMouse_entityTags[var8];
+				int var14 = (int)(var15 >>> 7 & 127L);
+				var14 = var14;
+				int var26 = Username.ViewportMouse_unpackX(var8);
+				int var16 = ScriptEvent.method1272(var8);
+				if (var26 == 2 && WorldMapArea.scene.getObjectFlags(Player.Scene_plane, var24, var14, var9) >= 0) {
+					ObjectDefinition var17 = WorldMapDecorationType.getObjectDefinition(var16);
+					if (var17.transforms != null) {
+						var17 = var17.transform();
 					}
 
-					RunException.soundSystem.players[var1] = var3;
+					if (var17 == null) {
+						continue;
+					}
+
+					if (Client.isItemSelected == 1) {
+						GameObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + AbstractArchive.colorStartTag(65535) + var17.name, 1, var16, var24, var14);
+					} else if (Client.isSpellSelected) {
+						if ((class81.selectedSpellFlags & 4) == 4) {
+							GameObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + AbstractArchive.colorStartTag(65535) + var17.name, 2, var16, var24, var14);
+						}
+					} else {
+						String[] var27 = var17.actions;
+						if (var27 != null) {
+							for (int var28 = 4; var28 >= 0; --var28) {
+								if (var27[var28] != null) {
+									short var20 = 0;
+									if (var28 == 0) {
+										var20 = 3;
+									}
+
+									if (var28 == 1) {
+										var20 = 4;
+									}
+
+									if (var28 == 2) {
+										var20 = 5;
+									}
+
+									if (var28 == 3) {
+										var20 = 6;
+									}
+
+									if (var28 == 4) {
+										var20 = 1001;
+									}
+
+									GameObject.insertMenuItemNoShift(var27[var28], AbstractArchive.colorStartTag(65535) + var17.name, var20, var16, var24, var14);
+								}
+							}
+						}
+
+						GameObject.insertMenuItemNoShift("Examine", AbstractArchive.colorStartTag(65535) + var17.name, 1002, var17.id, var24, var14);
+					}
 				}
 
-				return var3;
+				int var18;
-			} catch (Throwable var4) {
+				NPC var19;
-				return new PcmPlayer();
+				Player var21;
+				int[] var34;
+				int var36;
+				if (var26 == 1) {
+					NPC var31 = Client.npcs[var16];
+					if (var31 == null) {
+						continue;
+					}
+
+					if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) {
+						for (var18 = 0; var18 < Client.npcCount; ++var18) {
+							var19 = Client.npcs[Client.npcIndices[var18]];
+							if (var19 != null && var31 != var19 && var19.definition.size == 1 && var19.x == var31.x && var31.y == var19.y) {
+								TaskHandler.addNpcToMenu(var19.definition, Client.npcIndices[var18], var24, var14);
+							}
+						}
+
+						var18 = Players.Players_count;
+						var34 = Players.Players_indices;
+
+						for (var36 = 0; var36 < var18; ++var36) {
+							var21 = Client.players[var34[var36]];
+							if (var21 != null && var21.x == var31.x && var21.y == var31.y) {
+								class40.addPlayerToMenu(var21, var34[var36], var24, var14);
+							}
+						}
+					}
+
+					TaskHandler.addNpcToMenu(var31.definition, var16, var24, var14);
+				}
+
+				if (var26 == 0) {
+					Player var32 = Client.players[var16];
+					if (var32 == null) {
+						continue;
+					}
+
+					if ((var32.x & 127) == 64 && (var32.y & 127) == 64) {
+						for (var18 = 0; var18 < Client.npcCount; ++var18) {
+							var19 = Client.npcs[Client.npcIndices[var18]];
+							if (var19 != null && var19.definition.size == 1 && var19.x == var32.x && var19.y == var32.y) {
+								TaskHandler.addNpcToMenu(var19.definition, Client.npcIndices[var18], var24, var14);
+							}
+						}
+
+						var18 = Players.Players_count;
+						var34 = Players.Players_indices;
+
+						for (var36 = 0; var36 < var18; ++var36) {
+							var21 = Client.players[var34[var36]];
+							if (var21 != null && var21 != var32 && var21.x == var32.x && var32.y == var21.y) {
+								class40.addPlayerToMenu(var21, var34[var36], var24, var14);
+							}
+						}
+					}
+
+					if (var16 != Client.combatTargetPlayerIndex) {
+						class40.addPlayerToMenu(var32, var16, var24, var14);
+					} else {
+						var4 = var9;
+					}
+				}
+
+				if (var26 == 3) {
+					NodeDeque var33 = Client.groundItems[Player.Scene_plane][var24][var14];
+					if (var33 != null) {
+						for (TileItem var37 = (TileItem)var33.first(); var37 != null; var37 = (TileItem)var33.next()) {
+							ItemDefinition var35 = class222.ItemDefinition_get(var37.id);
+							if (Client.isItemSelected == 1) {
+								GameObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + AbstractArchive.colorStartTag(16748608) + var35.name, 16, var37.id, var24, var14);
+							} else if (Client.isSpellSelected) {
+								if ((class81.selectedSpellFlags & 1) == 1) {
+									GameObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + AbstractArchive.colorStartTag(16748608) + var35.name, 17, var37.id, var24, var14);
+								}
+							} else {
+								String[] var29 = var35.groundActions;
+
+								for (int var30 = 4; var30 >= 0; --var30) {
+									if (var29 != null && var29[var30] != null) {
+										byte var22 = 0;
+										if (var30 == 0) {
+											var22 = 18;
+										}
+
+										if (var30 == 1) {
+											var22 = 19;
+										}
+
+										if (var30 == 2) {
+											var22 = 20;
+										}
+
+										if (var30 == 3) {
+											var22 = 21;
+										}
+
+										if (var30 == 4) {
+											var22 = 22;
+										}
+
+										GameObject.insertMenuItemNoShift(var29[var30], AbstractArchive.colorStartTag(16748608) + var35.name, var22, var37.id, var24, var14);
+									} else if (var30 == 2) {
+										GameObject.insertMenuItemNoShift("Take", AbstractArchive.colorStartTag(16748608) + var35.name, 20, var37.id, var24, var14);
+									}
+								}
+
+								GameObject.insertMenuItemNoShift("Examine", AbstractArchive.colorStartTag(16748608) + var35.name, 1004, var37.id, var24, var14);
+							}
+						}
+					}
+				}
 			}
-		} else {
-			throw new IllegalArgumentException();
 		}
+
+		if (var4 != -1L) {
+			var8 = (int)(var4 >>> 0 & 127L);
+			int var10 = (int)(var4 >>> 7 & 127L);
+			Player var12 = Client.players[Client.combatTargetPlayerIndex];
+			class40.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10);
+		}
+
 	}
 }

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

@@ -3,21 +3,22 @@ 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("y")
+@ObfuscatedName("i")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("bk")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "[Llp;"
+		signature = "[Lie;"
 	)
-	@Export("worldSelectArrows")
+	@Export("WorldMapElement_cached")
-	static IndexedSprite[] worldSelectArrows;
+	public static WorldMapElement[] WorldMapElement_cached;
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lm;Lm;I)I",
+		signature = "(Lo;Lo;I)I",
-		garbageValue = "-1270482233"
+		garbageValue = "-2091641489"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -34,369 +35,187 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(ILcj;ZI)I",
-		garbageValue = "1729511296"
+		garbageValue = "-1959734110"
 	)
-	public static boolean method93(int var0) {
+	static int method134(int var0, Script var1, boolean var2) {
-		return (var0 >> 20 & 1) != 0;
+		int var3 = -1;
-	}
+		Widget var4;
-
+		if (var0 >= 2000) {
-	@ObfuscatedName("ez")
+			var0 -= 1000;
-	@ObfuscatedSignature(
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-		signature = "(I)I",
+			var4 = PacketBufferNode.getWidget(var3);
-		garbageValue = "-1447475674"
-	)
-	static int method100() {
-		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) {
-			int var0 = 0;
-
-			for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) {
-				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount;
-			}
-
-			return var0 * 10000 / Client.field908;
 		} else {
-			return 10000;
+			var4 = var2 ? class96.field1301 : ReflectionCheck.field1310;
-		}
-	}
-
-	@ObfuscatedName("ec")
-	@ObfuscatedSignature(
-		signature = "(IIB)V",
-		garbageValue = "99"
-	)
-	static void method91(int var0, int var1) {
-		int[] var2 = new int[9];
-
-		for (int var3 = 0; var3 < var2.length; ++var3) {
-			int var4 = var3 * 32 + 15 + 128;
-			int var5 = var4 * 3 + 600;
-			int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
-			int var9 = var1 - 334;
-			if (var9 < 0) {
-				var9 = 0;
-			} else if (var9 > 100) {
-				var9 = 100;
-			}
-
-			int var10 = (Client.zoomWidth - Client.zoomHeight) * var9 / 100 + Client.zoomHeight;
-			int var8 = var10 * var5 / 256;
-			var2[var3] = var7 * var8 >> 16;
 		}
 
-		Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
+		if (var0 == ScriptOpcodes.CC_SETPOSITION) {
-	}
+			Interpreter.Interpreter_intStackSize -= 4;
-
+			var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-	@ObfuscatedName("gq")
+			var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-	@ObfuscatedSignature(
+			var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-		signature = "(Lgw;I)V",
+			var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
-		garbageValue = "865930097"
+			GrandExchangeOfferAgeComparator.invalidateWidget(var4);
-	)
+			WorldMapID.client.alignWidget(var4);
-	static final void method105(class185 var0) {
+			if (var3 != -1 && var4.type == 0) {
-		PacketBuffer var1 = Client.packetWriter.packetBuffer;
+				class43.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
-		int var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		int var12;
-		int var13;
-		int var14;
-		if (class185.field2298 == var0) {
-			byte var2 = var1.readByte();
-			byte var3 = var1.readByte();
-			var4 = var1.readUnsignedByte();
-			var5 = var4 >> 2;
-			var6 = var4 & 3;
-			var7 = Client.field697[var5];
-			var8 = var1.method5471();
-			var9 = (var8 >> 4 & 7) + class40.field326;
-			var10 = (var8 & 7) + WorldMapSection2.field195;
-			byte var11 = var1.method5474();
-			var12 = var1.method5480();
-			var13 = var1.method5479();
-			var14 = var1.readUnsignedShort();
-			int var15 = var1.method5480();
-			byte var16 = var1.method5473();
-			Player var17;
-			if (var15 == Client.localPlayerIndex) {
-				var17 = class223.localPlayer;
-			} else {
-				var17 = Client.players[var15];
 			}
 
-			if (var17 != null) {
+			return 1;
-				ObjectDefinition var18 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(var14);
+		} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
-				int var19;
+			Interpreter.Interpreter_intStackSize -= 4;
-				int var20;
+			var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				if (var6 != 1 && var6 != 3) {
+			var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					var19 = var18.sizeX;
+			var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-					var20 = var18.sizeY;
+			var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
-				} else {
+			GrandExchangeOfferAgeComparator.invalidateWidget(var4);
-					var19 = var18.sizeY;
+			WorldMapID.client.alignWidget(var4);
-					var20 = var18.sizeX;
+			if (var3 != -1 && var4.type == 0) {
-				}
+				class43.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
-
-				int var21 = var9 + (var19 >> 1);
-				int var22 = var9 + (var19 + 1 >> 1);
-				int var23 = var10 + (var20 >> 1);
-				int var24 = var10 + (var20 + 1 >> 1);
-				int[][] var25 = Tiles.Tiles_heights[WorldMapRectangle.plane];
-				int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2;
-				int var27 = (var9 << 7) + (var19 << 6);
-				int var28 = (var10 << 7) + (var20 << 6);
-				Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28);
-				if (var29 != null) {
-					WorldMapSection1.updatePendingSpawn(WorldMapRectangle.plane, var9, var10, var7, -1, 0, 0, var12 + 1, var13 + 1);
-					var17.animationCycleStart = var12 + Client.cycle;
-					var17.animationCycleEnd = var13 + Client.cycle;
-					var17.model0 = var29;
-					var17.field606 = var9 * 128 + var19 * 64;
-					var17.field608 = var10 * 128 + var20 * 64;
-					var17.tileHeight2 = var26;
-					byte var30;
-					if (var2 > var11) {
-						var30 = var2;
-						var2 = var11;
-						var11 = var30;
-					}
-
-					if (var3 > var16) {
-						var30 = var3;
-						var3 = var16;
-						var16 = var30;
-					}
-
-					var17.field622 = var2 + var9;
-					var17.field612 = var11 + var9;
-					var17.field611 = var10 + var3;
-					var17.field613 = var10 + var16;
-				}
-			}
-		}
-
-		int var37;
-		int var38;
-		int var40;
-		if (class185.field2302 == var0) {
-			var37 = var1.method5480();
-			var38 = var1.method5471();
-			var4 = (var38 >> 4 & 7) + class40.field326;
-			var5 = (var38 & 7) + WorldMapSection2.field195;
-			var6 = var1.readUnsignedByte();
-			var7 = var6 >> 2;
-			var8 = var6 & 3;
-			var9 = Client.field697[var7];
-			if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) {
-				if (var9 == 0) {
-					BoundaryObject var31 = PacketWriter.scene.method3068(WorldMapRectangle.plane, var4, var5);
-					if (var31 != null) {
-						var40 = class81.Entity_unpackID(var31.tag);
-						if (var7 == 2) {
-							var31.entity1 = new DynamicObject(var40, 2, var8 + 4, WorldMapRectangle.plane, var4, var5, var37, false, var31.entity1);
-							var31.entity2 = new DynamicObject(var40, 2, var8 + 1 & 3, WorldMapRectangle.plane, var4, var5, var37, false, var31.entity2);
-						} else {
-							var31.entity1 = new DynamicObject(var40, var7, var8, WorldMapRectangle.plane, var4, var5, var37, false, var31.entity1);
-						}
-					}
-				}
-
-				if (var9 == 1) {
-					WallDecoration var42 = PacketWriter.scene.method3069(WorldMapRectangle.plane, var4, var5);
-					if (var42 != null) {
-						var40 = class81.Entity_unpackID(var42.tag);
-						if (var7 != 4 && var7 != 5) {
-							if (var7 == 6) {
-								var42.entity1 = new DynamicObject(var40, 4, var8 + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
-							} else if (var7 == 7) {
-								var42.entity1 = new DynamicObject(var40, 4, (var8 + 2 & 3) + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
-							} else if (var7 == 8) {
-								var42.entity1 = new DynamicObject(var40, 4, var8 + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
-								var42.entity2 = new DynamicObject(var40, 4, (var8 + 2 & 3) + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity2);
-							}
-						} else {
-							var42.entity1 = new DynamicObject(var40, 4, var8, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
-						}
-					}
-				}
-
-				if (var9 == 2) {
-					GameObject var43 = PacketWriter.scene.method3070(WorldMapRectangle.plane, var4, var5);
-					if (var7 == 11) {
-						var7 = 10;
-					}
-
-					if (var43 != null) {
-						var43.entity = new DynamicObject(class81.Entity_unpackID(var43.tag), var7, var8, WorldMapRectangle.plane, var4, var5, var37, false, var43.entity);
-					}
-				}
-
-				if (var9 == 3) {
-					FloorDecoration var44 = PacketWriter.scene.getFloorDecoration(WorldMapRectangle.plane, var4, var5);
-					if (var44 != null) {
-						var44.entity = new DynamicObject(class81.Entity_unpackID(var44.tag), 22, var8, WorldMapRectangle.plane, var4, var5, var37, false, var44.entity);
-					}
-				}
 			}
 
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
+			boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+			if (var5 != var4.isHidden) {
+				var4.isHidden = var5;
+				GrandExchangeOfferAgeComparator.invalidateWidget(var4);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
+			var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
+			var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+			return 1;
 		} else {
-			TileItem var33;
+			return 2;
-			if (class185.field2304 == var0) {
+		}
-				var37 = var1.method5470();
+	}
-				var38 = (var37 >> 4 & 7) + class40.field326;
-				var4 = (var37 & 7) + WorldMapSection2.field195;
-				var5 = var1.method5647();
-				if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) {
-					NodeDeque var32 = Client.groundItems[WorldMapRectangle.plane][var38][var4];
-					if (var32 != null) {
-						for (var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) {
-							if ((var5 & 32767) == var33.id) {
-								var33.remove();
-								break;
-							}
-						}
 
-						if (var32.last() == null) {
+	@ObfuscatedName("fr")
-							Client.groundItems[WorldMapRectangle.plane][var38][var4] = null;
+	@ObfuscatedSignature(
-						}
+		signature = "(I)V",
+		garbageValue = "-1403292124"
+	)
+	static void method130() {
+		Client.mouseLastLastPressedTimeMillis = 1L;
+		class3.mouseRecorder.index = 0;
+		class30.hasFocus = true;
+		Client.hadFocus = true;
+		Client.field663 = -1L;
+		class80.method2198();
+		Client.packetWriter.clearBuffer();
+		Client.packetWriter.packetBuffer.offset = 0;
+		Client.packetWriter.serverPacket = null;
+		Client.packetWriter.field1290 = null;
+		Client.packetWriter.field1286 = null;
+		Client.packetWriter.field1292 = null;
+		Client.packetWriter.serverPacketLength = 0;
+		Client.packetWriter.field1291 = 0;
+		Client.rebootTimer = 0;
+		Client.logoutTimer = 0;
+		Client.hintArrowType = 0;
+		Client.menuOptionsCount = 0;
+		Client.isMenuOpen = false;
+		MouseHandler.MouseHandler_idleCycles = 0;
+		Messages.Messages_channels.clear();
+		Messages.Messages_hashTable.clear();
+		Messages.Messages_queue.clear();
+		Messages.Messages_count = 0;
+		Client.isItemSelected = 0;
+		Client.isSpellSelected = false;
+		Client.soundEffectCount = 0;
+		Client.camAngleY = 0;
+		Client.oculusOrbState = 0;
+		GrandExchangeOfferWorldComparator.field30 = null;
+		Client.minimapState = 0;
+		Client.field856 = -1;
+		Client.destinationX = 0;
+		Client.destinationY = 0;
+		Client.playerAttackOption = AttackOption.AttackOption_hidden;
+		Client.npcAttackOption = AttackOption.AttackOption_hidden;
+		Client.npcCount = 0;
+		Players.Players_count = 0;
 
-						WorldMapCacheName.updateItemPile(var38, var4);
+		int var0;
-					}
+		for (var0 = 0; var0 < 2048; ++var0) {
-				}
+			Players.field1229[var0] = null;
+			Players.field1228[var0] = 1;
+		}
 
-			} else if (class185.field2296 == var0) {
+		for (var0 = 0; var0 < 2048; ++var0) {
-				var37 = var1.method5471();
+			Client.players[var0] = null;
-				var38 = var37 >> 2;
+		}
-				var4 = var37 & 3;
-				var5 = Client.field697[var38];
-				var6 = var1.method5470();
-				var7 = (var6 >> 4 & 7) + class40.field326;
-				var8 = (var6 & 7) + WorldMapSection2.field195;
-				if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
-					WorldMapSection1.updatePendingSpawn(WorldMapRectangle.plane, var7, var8, var5, -1, var38, var4, 0, -1);
-				}
 
-			} else if (class185.field2297 == var0) {
+		for (var0 = 0; var0 < 32768; ++var0) {
-				var37 = var1.method5480();
+			Client.npcs[var0] = null;
-				var38 = var1.method5479();
+		}
-				var4 = var1.method5470();
-				var5 = (var4 >> 4 & 7) + class40.field326;
-				var6 = (var4 & 7) + WorldMapSection2.field195;
-				if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
-					var33 = new TileItem();
-					var33.id = var38;
-					var33.quantity = var37;
-					if (Client.groundItems[WorldMapRectangle.plane][var5][var6] == null) {
-						Client.groundItems[WorldMapRectangle.plane][var5][var6] = new NodeDeque();
-					}
 
-					Client.groundItems[WorldMapRectangle.plane][var5][var6].addFirst(var33);
+		Client.combatTargetPlayerIndex = -1;
-					WorldMapCacheName.updateItemPile(var5, var6);
+		Client.projectiles.clear();
-				}
+		Client.graphicsObjects.clear();
-
-			} else {
-				if (class185.field2300 == var0) {
-					var37 = var1.method5511();
-					var38 = (var37 >> 4 & 7) + class40.field326;
-					var4 = (var37 & 7) + WorldMapSection2.field195;
-					var5 = var1.method5511();
-					var6 = var5 >> 4 & 15;
-					var7 = var5 & 7;
-					var8 = var1.readUnsignedShort();
-					var9 = var1.method5511();
-					if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) {
-						var10 = var6 + 1;
-						if (class223.localPlayer.pathX[0] >= var38 - var10 && class223.localPlayer.pathX[0] <= var10 + var38 && class223.localPlayer.pathY[0] >= var4 - var10 && class223.localPlayer.pathY[0] <= var10 + var4 && Client.field868 != 0 && var7 > 0 && Client.soundEffectCount < 50) {
-							Client.soundEffectIds[Client.soundEffectCount] = var8;
-							Client.queuedSoundEffectLoops[Client.soundEffectCount] = var7;
-							Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9;
-							Client.soundEffects[Client.soundEffectCount] = null;
-							Client.soundLocations[Client.soundEffectCount] = var6 + (var4 << 8) + (var38 << 16);
-							++Client.soundEffectCount;
-						}
-					}
-				}
-
-				if (class185.field2299 == var0) {
-					var37 = var1.readUnsignedByte();
-					var38 = var37 >> 2;
-					var4 = var37 & 3;
-					var5 = Client.field697[var38];
-					var6 = var1.method5470();
-					var7 = (var6 >> 4 & 7) + class40.field326;
-					var8 = (var6 & 7) + WorldMapSection2.field195;
-					var9 = var1.readUnsignedShort();
-					if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
-						WorldMapSection1.updatePendingSpawn(WorldMapRectangle.plane, var7, var8, var5, var9, var38, var4, 0, -1);
-					}
-
-				} else if (class185.field2295 == var0) {
-					var37 = var1.method5647();
-					var38 = var1.method5511();
-					var4 = (var38 >> 4 & 7) + class40.field326;
-					var5 = (var38 & 7) + WorldMapSection2.field195;
-					var6 = var1.method5479();
-					var7 = var1.method5647();
-					byte var39 = var1.method5475();
-					var9 = var1.method5511() * 4;
-					var10 = var1.readUnsignedByte();
-					var40 = var1.method5470();
-					byte var41 = var1.method5473();
-					var13 = var1.method5486();
-					var14 = var1.method5511() * 4;
-					var12 = var41 + var4;
-					var8 = var39 + var5;
-					if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104 && var12 >= 0 && var8 >= 0 && var12 < 104 && var8 < 104 && var37 != 65535) {
-						var4 = var4 * 128 + 64;
-						var5 = var5 * 128 + 64;
-						var12 = var12 * 128 + 64;
-						var8 = var8 * 128 + 64;
-						Projectile var34 = new Projectile(var37, WorldMapRectangle.plane, var4, var5, MusicPatchPcmStream.getTileHeight(var4, var5, WorldMapRectangle.plane) - var14, var6 + Client.cycle, var7 + Client.cycle, var40, var10, var13, var9);
-						var34.setDestination(var12, var8, MusicPatchPcmStream.getTileHeight(var12, var8, WorldMapRectangle.plane) - var9, var6 + Client.cycle);
-						Client.projectiles.addFirst(var34);
-					}
-
-				} else if (class185.field2303 != var0) {
-					if (class185.field2301 == var0) {
-						var37 = var1.method5647();
-						var38 = var1.method5470();
-						var4 = var1.method5470();
-						var5 = (var4 >> 4 & 7) + class40.field326;
-						var6 = (var4 & 7) + WorldMapSection2.field195;
-						var7 = var1.method5479();
-						if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
-							var5 = var5 * 128 + 64;
-							var6 = var6 * 128 + 64;
-							GraphicsObject var45 = new GraphicsObject(var7, WorldMapRectangle.plane, var5, var6, MusicPatchPcmStream.getTileHeight(var5, var6, WorldMapRectangle.plane) - var38, var37, Client.cycle);
-							Client.graphicsObjects.addFirst(var45);
-						}
-
-					}
-				} else {
-					var37 = var1.method5479();
-					var38 = var1.method5480();
-					var4 = var1.method5471();
-					var5 = (var4 >> 4 & 7) + class40.field326;
-					var6 = (var4 & 7) + WorldMapSection2.field195;
-					var7 = var1.method5480();
-					if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
-						NodeDeque var35 = Client.groundItems[WorldMapRectangle.plane][var5][var6];
-						if (var35 != null) {
-							for (TileItem var36 = (TileItem)var35.last(); var36 != null; var36 = (TileItem)var35.previous()) {
-								if ((var37 & 32767) == var36.id && var7 == var36.quantity) {
-									var36.quantity = var38;
-									break;
-								}
-							}
-
-							WorldMapCacheName.updateItemPile(var5, var6);
-						}
-					}
 
+		for (var0 = 0; var0 < 4; ++var0) {
+			for (int var1 = 0; var1 < 104; ++var1) {
+				for (int var2 = 0; var2 < 104; ++var2) {
+					Client.groundItems[var0][var1][var2] = null;
 				}
 			}
 		}
+
+		Client.pendingSpawns = new NodeDeque();
+		PacketWriter.friendSystem.clear();
+
+		for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) {
+			VarpDefinition var3 = Varcs.method2352(var0);
+			if (var3 != null) {
+				Varps.Varps_temp[var0] = 0;
+				Varps.Varps_main[var0] = 0;
+			}
+		}
+
+		class1.varcs.clearTransient();
+		Client.followerIndex = -1;
+		if (Client.rootInterface != -1) {
+			PlayerAppearance.method4191(Client.rootInterface);
+		}
+
+		for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) {
+			GrandExchangeOfferOwnWorldComparator.closeInterface(var4, true);
+		}
+
+		Client.rootInterface = -1;
+		Client.interfaceParents = new NodeHashTable(8);
+		Client.meslayerContinueWidget = null;
+		Client.menuOptionsCount = 0;
+		Client.isMenuOpen = false;
+		Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
+
+		for (var0 = 0; var0 < 8; ++var0) {
+			Client.playerMenuActions[var0] = null;
+			Client.playerOptionsPriorities[var0] = false;
+		}
+
+		ItemContainer.itemContainers = new NodeHashTable(32);
+		Client.isLoading = true;
+
+		for (var0 = 0; var0 < 100; ++var0) {
+			Client.field842[var0] = true;
+		}
+
+		PacketBufferNode var5 = SoundSystem.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher);
+		var5.packetBuffer.writeByte(WallDecoration.getWindowedMode());
+		var5.packetBuffer.writeShort(class286.canvasWidth);
+		var5.packetBuffer.writeShort(FloorUnderlayDefinition.canvasHeight);
+		Client.packetWriter.addNode(var5);
+		class4.clanChat = null;
+
+		for (var0 = 0; var0 < 8; ++var0) {
+			Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
+		}
+
+		WorldMapData_1.grandExchangeEvents = null;
 	}
 }

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

@@ -5,120 +5,333 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("c")
+@ObfuscatedName("m")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("s")
+	@ObfuscatedName("dy")
-	@ObfuscatedGetter(
-		intValue = -1987201491
-	)
-	@Export("loginBoxCenter")
-	static int loginBoxCenter;
-
-	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lm;Lm;I)I",
+		signature = "Lij;"
-		garbageValue = "1379036847"
+	)
+	@Export("archive8")
+	static Archive archive8;
+	@ObfuscatedName("ex")
+	@ObfuscatedGetter(
+		intValue = -1695293753
+	)
+	@Export("port3")
+	static int port3;
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(Lo;Lo;I)I",
+		garbageValue = "-1452765932"
 	)
 	@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("n")
+	public int compare(Object var1, Object var2) {
-	@ObfuscatedSignature(
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-		signature = "(II)Lix;",
-		garbageValue = "-1839745147"
-	)
-	@Export("SequenceDefinition_get")
-	public static SequenceDefinition SequenceDefinition_get(int var0) {
-		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
-			var1 = new SequenceDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode();
-			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("hy")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/Object;ZI)[B",
+		signature = "(IIIIIIIB)V",
-		garbageValue = "264970062"
+		garbageValue = "19"
 	)
-	@Export("serialize")
+	@Export("addPendingSpawnToScene")
-	public static byte[] serialize(Object var0, boolean var1) {
+	static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (var0 == null) {
+		if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
-			return null;
+			if (Client.isLowDetail && var0 != Player.Scene_plane) {
-		} else if (var0 instanceof byte[]) {
+				return;
-			byte[] var6 = (byte[])((byte[])var0);
+			}
-			if (var1) {
+
-				int var4 = var6.length;
+			long var7 = 0L;
-				byte[] var5 = new byte[var4];
+			boolean var9 = true;
-				System.arraycopy(var6, 0, var5, 0, var4);
+			boolean var10 = false;
-				return var5;
+			boolean var11 = false;
-			} else {
+			if (var1 == 0) {
-				return var6;
+				var7 = WorldMapArea.scene.getBoundaryObjectTag(var0, var2, var3);
+			}
+
+			if (var1 == 1) {
+				var7 = WorldMapArea.scene.getWallDecorationTag(var0, var2, var3);
+			}
+
+			if (var1 == 2) {
+				var7 = WorldMapArea.scene.getGameObjectTag(var0, var2, var3);
+			}
+
+			if (var1 == 3) {
+				var7 = WorldMapArea.scene.getFloorDecorationTag(var0, var2, var3);
+			}
+
+			int var12;
+			if (0L != var7) {
+				var12 = WorldMapArea.scene.getObjectFlags(var0, var2, var3, var7);
+				int var39 = UserComparator8.Entity_unpackID(var7);
+				int var40 = var12 & 31;
+				int var41 = var12 >> 6 & 3;
+				ObjectDefinition var13;
+				if (var1 == 0) {
+					WorldMapArea.scene.removeBoundaryObject(var0, var2, var3);
+					var13 = WorldMapDecorationType.getObjectDefinition(var39);
+					if (var13.interactType != 0) {
+						Client.collisionMaps[var0].method3690(var2, var3, var40, var41, var13.boolean1);
+					}
+				}
+
+				if (var1 == 1) {
+					WorldMapArea.scene.removeWallDecoration(var0, var2, var3);
+				}
+
+				if (var1 == 2) {
+					WorldMapArea.scene.removeGameObject(var0, var2, var3);
+					var13 = WorldMapDecorationType.getObjectDefinition(var39);
+					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) {
+						return;
+					}
+
+					if (var13.interactType != 0) {
+						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1);
+					}
+				}
+
+				if (var1 == 3) {
+					WorldMapArea.scene.removeFloorDecoration(var0, var2, var3);
+					var13 = WorldMapDecorationType.getObjectDefinition(var39);
+					if (var13.interactType == 1) {
+						Client.collisionMaps[var0].method3693(var2, var3);
+					}
+				}
+			}
+
+			if (var4 >= 0) {
+				var12 = var0;
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
+					var12 = var0 + 1;
+				}
+
+				Scene var42 = WorldMapArea.scene;
+				CollisionMap var14 = Client.collisionMaps[var0];
+				ObjectDefinition var15 = WorldMapDecorationType.getObjectDefinition(var4);
+				int var16;
+				int var17;
+				if (var5 != 1 && var5 != 3) {
+					var16 = var15.sizeX;
+					var17 = var15.sizeY;
+				} else {
+					var16 = var15.sizeY;
+					var17 = var15.sizeX;
+				}
+
+				int var18;
+				int var19;
+				if (var16 + var2 <= 104) {
+					var18 = (var16 >> 1) + var2;
+					var19 = var2 + (var16 + 1 >> 1);
+				} else {
+					var18 = var2;
+					var19 = var2 + 1;
+				}
+
+				int var20;
+				int var21;
+				if (var3 + var17 <= 104) {
+					var20 = var3 + (var17 >> 1);
+					var21 = var3 + (var17 + 1 >> 1);
+				} else {
+					var20 = var3;
+					var21 = var3 + 1;
+				}
+
+				int[][] var22 = Tiles.Tiles_heights[var12];
+				int var23 = var22[var18][var21] + var22[var18][var20] + var22[var19][var20] + var22[var19][var21] >> 2;
+				int var24 = (var2 << 7) + (var16 << 6);
+				int var25 = (var3 << 7) + (var17 << 6);
+				long var26 = class160.calculateTag(var2, var3, 2, var15.int1 == 0, var4);
+				int var28 = (var5 << 6) + var6;
+				if (var15.int3 == 1) {
+					var28 += 256;
+				}
+
+				Object var29;
+				if (var6 == 22) {
+					if (var15.animationId == -1 && var15.transforms == null) {
+						var29 = var15.getModel(22, var5, var22, var24, var23, var25);
+					} else {
+						var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+					}
+
+					var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
+					if (var15.interactType == 1) {
+						var14.setBlockedByFloorDec(var2, var3);
+					}
+				} else if (var6 != 10 && var6 != 11) {
+					if (var6 >= 12) {
+						if (var15.animationId == -1 && var15.transforms == null) {
+							var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
+						} else {
+							var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+						}
+
+						var42.method3213(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+						if (var15.interactType != 0) {
+							var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
+						}
+					} else if (var6 == 0) {
+						if (var15.animationId == -1 && var15.transforms == null) {
+							var29 = var15.getModel(0, var5, var22, var24, var23, var25);
+						} else {
+							var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+						}
+
+						var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field489[var5], 0, var26, var28);
+						if (var15.interactType != 0) {
+							var14.method3685(var2, var3, var6, var5, var15.boolean1);
+						}
+					} else if (var6 == 1) {
+						if (var15.animationId == -1 && var15.transforms == null) {
+							var29 = var15.getModel(1, var5, var22, var24, var23, var25);
+						} else {
+							var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+						}
+
+						var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field490[var5], 0, var26, var28);
+						if (var15.interactType != 0) {
+							var14.method3685(var2, var3, var6, var5, var15.boolean1);
+						}
+					} else {
+						int var35;
+						if (var6 == 2) {
+							var35 = var5 + 1 & 3;
+							Object var30;
+							Object var31;
+							if (var15.animationId == -1 && var15.transforms == null) {
+								var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25);
+								var31 = var15.getModel(2, var35, var22, var24, var23, var25);
+							} else {
+								var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+								var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null);
+							}
+
+							var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.field489[var5], Tiles.field489[var35], var26, var28);
+							if (var15.interactType != 0) {
+								var14.method3685(var2, var3, var6, var5, var15.boolean1);
+							}
+						} else if (var6 == 3) {
+							if (var15.animationId == -1 && var15.transforms == null) {
+								var29 = var15.getModel(3, var5, var22, var24, var23, var25);
+							} else {
+								var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+							}
+
+							var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field490[var5], 0, var26, var28);
+							if (var15.interactType != 0) {
+								var14.method3685(var2, var3, var6, var5, var15.boolean1);
+							}
+						} else if (var6 == 9) {
+							if (var15.animationId == -1 && var15.transforms == null) {
+								var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
+							} else {
+								var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+							}
+
+							var42.method3213(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+							if (var15.interactType != 0) {
+								var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
+							}
+						} else if (var6 == 4) {
+							if (var15.animationId == -1 && var15.transforms == null) {
+								var29 = var15.getModel(4, var5, var22, var24, var23, var25);
+							} else {
+								var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+							}
+
+							var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field489[var5], 0, 0, 0, var26, var28);
+						} else {
+							Object var32;
+							long var36;
+							if (var6 == 5) {
+								var35 = 16;
+								var36 = var42.getBoundaryObjectTag(var0, var2, var3);
+								if (var36 != 0L) {
+									var35 = WorldMapDecorationType.getObjectDefinition(UserComparator8.Entity_unpackID(var36)).int2;
+								}
+
+								if (var15.animationId == -1 && var15.transforms == null) {
+									var32 = var15.getModel(4, var5, var22, var24, var23, var25);
+								} else {
+									var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+								}
+
+								var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.field489[var5], 0, var35 * Tiles.field491[var5], var35 * Tiles.field498[var5], var26, var28);
+							} else if (var6 == 6) {
+								var35 = 8;
+								var36 = var42.getBoundaryObjectTag(var0, var2, var3);
+								if (var36 != 0L) {
+									var35 = WorldMapDecorationType.getObjectDefinition(UserComparator8.Entity_unpackID(var36)).int2 / 2;
+								}
+
+								if (var15.animationId == -1 && var15.transforms == null) {
+									var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
+								} else {
+									var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+								}
+
+								var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.field493[var5], var35 * Tiles.field494[var5], var26, var28);
+							} else if (var6 == 7) {
+								int var38 = var5 + 2 & 3;
+								if (var15.animationId == -1 && var15.transforms == null) {
+									var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25);
+								} else {
+									var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+								}
+
+								var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28);
+							} else if (var6 == 8) {
+								var35 = 8;
+								var36 = var42.getBoundaryObjectTag(var0, var2, var3);
+								if (0L != var36) {
+									var35 = WorldMapDecorationType.getObjectDefinition(UserComparator8.Entity_unpackID(var36)).int2 / 2;
+								}
+
+								int var34 = var5 + 2 & 3;
+								Object var33;
+								if (var15.animationId == -1 && var15.transforms == null) {
+									var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
+									var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25);
+								} else {
+									var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+									var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+								}
+
+								var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.field493[var5], var35 * Tiles.field494[var5], var26, var28);
+							}
+						}
+					}
+				} else {
+					if (var15.animationId == -1 && var15.transforms == null) {
+						var29 = var15.getModel(10, var5, var22, var24, var23, var25);
+					} else {
+						var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+					}
+
+					if (var29 != null) {
+						var42.method3213(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
+					}
+
+					if (var15.interactType != 0) {
+						var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
+					}
+				}
 			}
-		} else if (var0 instanceof AbstractByteArrayCopier) {
-			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
-			return var2.get();
-		} else {
-			throw new IllegalArgumentException();
 		}
-	}
 
-	@ObfuscatedName("eg")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "35"
-	)
-	static final void method139() {
-		Scene.Scene_isLowDetail = false;
-		Client.isLowDetail = false;
-	}
-
-	@ObfuscatedName("gl")
-	@ObfuscatedSignature(
-		signature = "(Lbi;B)Z",
-		garbageValue = "64"
-	)
-	static boolean method134(Player var0) {
-		if (Client.drawPlayerNames == 0) {
-			return false;
-		} else if (class223.localPlayer != var0) {
-			boolean var1 = (Client.drawPlayerNames & 4) != 0;
-			boolean var2 = var1;
-			boolean var3;
-			if (!var1) {
-				var3 = (Client.drawPlayerNames & 1) != 0;
-				var2 = var3 && var0.isFriend();
-			}
-
-			var3 = var2;
-			if (!var2) {
-				boolean var4 = (Client.drawPlayerNames & 2) != 0;
-				var3 = var4 && var0.isClanMember();
-			}
-
-			return var3;
-		} else {
-			return class16.method195();
-		}
 	}
 }

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

@@ -4,20 +4,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("p")
+@ObfuscatedName("l")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("qd")
+	@ObfuscatedName("su")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Lif;"
 	)
-	@Export("pcmPlayer1")
+	public static class237 field30;
-	static PcmPlayer pcmPlayer1;
+	@ObfuscatedName("gq")
-
-	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lm;Lm;I)I",
+		signature = "[Llw;"
-		garbageValue = "-1166584542"
+	)
+	@Export("mapSceneSprites")
+	static IndexedSprite[] mapSceneSprites;
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(Lo;Lo;I)I",
+		garbageValue = "-1039066060"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -32,206 +37,62 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(III)Lho;",
+		signature = "(I)[Lgs;",
-		garbageValue = "-217608323"
+		garbageValue = "-126362707"
 	)
-	@Export("getWidgetChild")
+	static LoginPacket[] method105() {
-	public static Widget getWidgetChild(int var0, int var1) {
+		return new LoginPacket[]{LoginPacket.field2287, LoginPacket.field2284, LoginPacket.field2286, LoginPacket.field2283, LoginPacket.field2285};
-		Widget var2 = Canvas.getWidget(var0);
-		if (var1 == -1) {
-			return var2;
-		} else {
-			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
-		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("hc")
 	@ObfuscatedSignature(
-		signature = "(Lkl;IIIIIII)V",
+		signature = "(IIIIIIIIIB)V",
-		garbageValue = "-109432634"
+		garbageValue = "-70"
 	)
-	@Export("loadTerrain")
+	@Export("updatePendingSpawn")
-	static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+	static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		int var7;
+		PendingSpawn var9 = null;
-		if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
-			Tiles.Tiles_renderFlags[var1][var2][var3] = 0;
 
-			while (true) {
+		for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) {
-				var7 = var0.readUnsignedByte();
+			if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) {
-				if (var7 == 0) {
+				var9 = var10;
-					if (var1 == 0) {
+				break;
-						Tiles.Tiles_heights[0][var2][var3] = -WorldMapDecoration.method347(var2 + 932731 + var4, var5 + var3 + 556238) * 8;
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
-					}
-					break;
-				}
-
-				if (var7 == 1) {
-					int var8 = var0.readUnsignedByte();
-					if (var8 == 1) {
-						var8 = 0;
-					}
-
-					if (var1 == 0) {
-						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8;
-					}
-					break;
-				}
-
-				if (var7 <= 49) {
-					Tiles.field483[var1][var2][var3] = var0.readByte();
-					DevicePcmPlayerProvider.field393[var1][var2][var3] = (byte)((var7 - 2) / 4);
-					class287.field3634[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
-				} else if (var7 <= 81) {
-					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49);
-				} else {
-					Tiles.field501[var1][var2][var3] = (byte)(var7 - 81);
-				}
-			}
-		} else {
-			while (true) {
-				var7 = var0.readUnsignedByte();
-				if (var7 == 0) {
-					break;
-				}
-
-				if (var7 == 1) {
-					var0.readUnsignedByte();
-					break;
-				}
-
-				if (var7 <= 49) {
-					var0.readUnsignedByte();
-				}
 			}
 		}
 
+		if (var9 == null) {
+			var9 = new PendingSpawn();
+			var9.plane = var0;
+			var9.type = var3;
+			var9.x = var1;
+			var9.y = var2;
+			FaceNormal.method3396(var9);
+			Client.pendingSpawns.addFirst(var9);
+		}
+
+		var9.id = var4;
+		var9.field917 = var5;
+		var9.orientation = var6;
+		var9.delay = var7;
+		var9.hitpoints = var8;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("ld")
 	@ObfuscatedSignature(
-		signature = "(IIIIIZI)Llf;",
+		signature = "(Lkc;II)V",
-		garbageValue = "-366639753"
+		garbageValue = "-1416348373"
 	)
-	@Export("getItemSprite")
+	static void method103(Buffer var0, int var1) {
-	public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
+		ClanMate.method5151(var0.array, var1);
-		if (var1 == -1) {
+		if (JagexCache.JagexCache_randomDat != null) {
-			var4 = 0;
+			try {
-		} else if (var4 == 2 && var1 != 1) {
+				JagexCache.JagexCache_randomDat.seek(0L);
-			var4 = 1;
+				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24);
-		}
+			} catch (Exception var3) {
-
-		long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16);
-		Sprite var8;
-		if (!var5) {
-			var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6);
-			if (var8 != null) {
-				return var8;
 			}
 		}
 
-		ItemDefinition var9 = Occluder.ItemDefinition_get(var0);
-		if (var1 > 1 && var9.countobj != null) {
-			int var10 = -1;
-
-			for (int var11 = 0; var11 < 10; ++var11) {
-				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) {
-					var10 = var9.countobj[var11];
-				}
-			}
-
-			if (var10 != -1) {
-				var9 = Occluder.ItemDefinition_get(var10);
-			}
-		}
-
-		Model var19 = var9.getModel(1);
-		if (var19 == null) {
-			return null;
-		} else {
-			Sprite var20 = null;
-			if (var9.noteTemplate != -1) {
-				var20 = getItemSprite(var9.note, 10, 1, 0, 0, true);
-				if (var20 == null) {
-					return null;
-				}
-			} else if (var9.notedId != -1) {
-				var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
-				if (var20 == null) {
-					return null;
-				}
-			} else if (var9.placeholderTemplate != -1) {
-				var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
-				if (var20 == null) {
-					return null;
-				}
-			}
-
-			int[] var12 = Rasterizer2D.Rasterizer2D_pixels;
-			int var13 = Rasterizer2D.Rasterizer2D_width;
-			int var14 = Rasterizer2D.Rasterizer2D_height;
-			int[] var15 = new int[4];
-			Rasterizer2D.Rasterizer2D_getClipArray(var15);
-			var8 = new Sprite(36, 32);
-			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
-			Rasterizer2D.Rasterizer2D_clear();
-			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
-			Rasterizer3D.method2992(16, 16);
-			Rasterizer3D.field1754 = false;
-			if (var9.placeholderTemplate != -1) {
-				var20.drawTransBgAt(0, 0);
-			}
-
-			int var16 = var9.zoom2d;
-			if (var5) {
-				var16 = (int)(1.5D * (double)var16);
-			} else if (var2 == 2) {
-				var16 = (int)(1.04D * (double)var16);
-			}
-
-			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
-			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
-			var19.calculateBoundsCylinder();
-			var19.method2870(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
-			if (var9.notedId != -1) {
-				var20.drawTransBgAt(0, 0);
-			}
-
-			if (var2 >= 1) {
-				var8.outline(1);
-			}
-
-			if (var2 >= 2) {
-				var8.outline(16777215);
-			}
-
-			if (var3 != 0) {
-				var8.shadow(var3);
-			}
-
-			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
-			if (var9.noteTemplate != -1) {
-				var20.drawTransBgAt(0, 0);
-			}
-
-			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
-				FaceNormal.ItemDefinition_fontPlain11.draw(class43.method839(var1), 0, 9, 16776960, 1);
-			}
-
-			if (!var5) {
-				ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6);
-			}
-
-			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
-			Rasterizer2D.Rasterizer2D_setClipArray(var15);
-			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
-			Rasterizer3D.field1754 = true;
-			return var8;
-		}
 	}
 }

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

@@ -3,97 +3,92 @@ 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("kw")
+@ObfuscatedName("kb")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("fz")
+	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "Lkn;"
-	)
-	@Export("fontPlain12")
-	static Font fontPlain12;
-	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1913101075
+		intValue = 355639221
 	)
 	@Export("compass")
 	public int compass;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 1345037469
+	)
+	public int field3787;
 	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -245940859
+		intValue = 1267920099
-	)
-	public int field3797;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 2030709025
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 936076039
+		intValue = -1711317783
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1090087377
+		intValue = 1346521291
 	)
-	public int field3800;
+	public int field3790;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1274199689
+		intValue = 850710053
 	)
-	public int field3796;
+	public int field3786;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 423516137
-	)
-	public int field3802;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 1649613365
-	)
-	public int field3803;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -1828299055
-	)
-	public int field3804;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 495147529
-	)
-	public int field3807;
 	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1539500843
+		intValue = 258806615
 	)
-	public int field3806;
+	public int field3791;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1735079565
+	)
+	public int field3793;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = 579452143
+	)
+	public int field3794;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 942987761
+	)
+	public int field3795;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -2075865955
+	)
+	public int field3796;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3797 = -1;
+		this.field3787 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3800 = -1;
+		this.field3790 = -1;
+		this.field3786 = -1;
+		this.field3791 = -1;
+		this.field3793 = -1;
+		this.field3794 = -1;
+		this.field3795 = -1;
 		this.field3796 = -1;
-		this.field3802 = -1;
-		this.field3803 = -1;
-		this.field3804 = -1;
-		this.field3807 = -1;
-		this.field3806 = -1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lhp;I)V",
+		signature = "(Lhq;I)V",
-		garbageValue = "1722575536"
+		garbageValue = "-1902520988"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3794.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3785.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -107,18 +102,32 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5453();
+				this.compass = var3.method5638();
-				this.field3797 = var3.method5453();
+				this.field3787 = var3.method5638();
-				this.mapScenes = var3.method5453();
+				this.mapScenes = var3.method5638();
-				this.headIconsPk = var3.method5453();
+				this.headIconsPk = var3.method5638();
-				this.field3800 = var3.method5453();
+				this.field3790 = var3.method5638();
-				this.field3796 = var3.method5453();
+				this.field3786 = var3.method5638();
-				this.field3802 = var3.method5453();
+				this.field3791 = var3.method5638();
-				this.field3803 = var3.method5453();
+				this.field3793 = var3.method5638();
-				this.field3804 = var3.method5453();
+				this.field3794 = var3.method5638();
-				this.field3807 = var3.method5453();
+				this.field3795 = var3.method5638();
-				this.field3806 = var3.method5453();
+				this.field3796 = var3.method5638();
 			}
 		}
 	}
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		signature = "(ILcj;ZI)I",
+		garbageValue = "1720763557"
+	)
+	static int method6006(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.LOGOUT) {
+			Client.logoutTimer = 250;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
 }

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

@@ -1,4 +1,3 @@
-import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -8,64 +7,61 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("bp")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("ec")
+	@ObfuscatedName("a")
-	@Export("secureRandom")
-	static SecureRandom secureRandom;
-	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -725302413
+		intValue = 1802533403
-	)
-	@Export("height")
-	int height;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = 781452541
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 34616617
+		intValue = 41870533
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1951259679
+		intValue = 2097627587
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("r")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1240960337
+		intValue = 1396277017
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("p")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1722241771
+		intValue = 176169087
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("q")
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -1076898081
+	)
+	@Export("height")
+	int height;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lix;"
+		signature = "Liv;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 926579167
+		intValue = 977223341
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1223841967
+		intValue = -706128457
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -79,20 +75,20 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = InterfaceParent.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = MenuAction.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var8);
+			this.sequenceDefinition = PlayerType.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(IB)V",
-		garbageValue = "-72"
+		garbageValue = "1"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -111,14 +107,14 @@ public final class GraphicsObject extends Entity {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Ldh;",
+		signature = "(B)Ldv;",
-		garbageValue = "-62237472"
+		garbageValue = "-40"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = InterfaceParent.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = MenuAction.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -128,4 +124,54 @@ public final class GraphicsObject extends Entity {
 
 		return var2 == null ? null : var2;
 	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(II)I",
+		garbageValue = "-1912506698"
+	)
+	public static int method2158(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;
+	}
+
+	@ObfuscatedName("n")
+	static boolean method2155(long var0) {
+		boolean var2 = var0 != 0L;
+		if (var2) {
+			boolean var3 = (int)(var0 >>> 16 & 1L) == 1;
+			var2 = !var3;
+		}
+
+		return var2;
+	}
+
+	@ObfuscatedName("hi")
+	@ObfuscatedSignature(
+		signature = "(IIII)I",
+		garbageValue = "-1853163943"
+	)
+	@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] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7;
+			int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7;
+			return var8 * (128 - var7) + var7 * var9 >> 7;
+		} else {
+			return 0;
+		}
+	}
 }

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

@@ -1,42 +1,46 @@
 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("cz")
+@ObfuscatedName("cx")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("bu")
-	@ObfuscatedSignature(
-		signature = "Llp;"
-	)
-	@Export("worldSelectRightSprite")
-	static IndexedSprite worldSelectRightSprite;
 	@ObfuscatedName("v")
+	@Export("SpriteBuffer_yOffsets")
+	public static int[] SpriteBuffer_yOffsets;
+	@ObfuscatedName("fj")
+	@ObfuscatedGetter(
+		intValue = 1157381415
+	)
+	@Export("baseY")
+	static int baseY;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lip;"
+		signature = "Lil;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Ljs;"
+		signature = "Ljm;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		signature = "(Lip;)V"
+		signature = "(Lil;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
+		signature = "(IIIII)V",
-		garbageValue = "1"
+		garbageValue = "703172784"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -69,10 +73,10 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IB)Lbq;",
+		signature = "(II)Lbo;",
-		garbageValue = "109"
+		garbageValue = "1147155972"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -94,91 +98,33 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-783831173"
+		garbageValue = "-47"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method4775();
+		return this.updates.method5004();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		signature = "(Llb;III)I",
+		signature = "(I)V",
-		garbageValue = "-1932083268"
+		garbageValue = "2136910933"
 	)
-	static int method2034(IterableNodeHashTable var0, int var1, int var2) {
+	protected static final void method2161() {
-		if (var0 == null) {
+		GameShell.clock.mark();
-			return var2;
-		} else {
-			IntegerNode var3 = (IntegerNode)var0.get((long)var1);
-			return var3 == null ? var2 : var3.integer;
-		}
-	}
 
-	@ObfuscatedName("q")
+		int var0;
-	@ObfuscatedSignature(
+		for (var0 = 0; var0 < 32; ++var0) {
-		signature = "(IZI)Ljava/lang/String;",
+			GameShell.graphicsTickTimes[var0] = 0L;
-		garbageValue = "878473077"
-	)
-	@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("fr")
-	@ObfuscatedSignature(
-		signature = "(Lby;I)V",
-		garbageValue = "1394806934"
-	)
-	static final void method2032(Actor var0) {
-		if (var0.field976 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
-			int var1 = var0.field976 - var0.field948;
-			int var2 = Client.cycle - var0.field948;
-			int var3 = var0.size * -527978816 + var0.field971 * 128;
-			int var4 = var0.size * -527978816 + var0.field973 * 128;
-			int var5 = var0.field972 * 128 + var0.size * -527978816;
-			int var6 = var0.size * -527978816 + var0.field974 * 128;
-			var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1;
-			var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1;
 		}
 
-		var0.field949 = 0;
+		for (var0 = 0; var0 < 32; ++var0) {
-		var0.orientation = var0.field977;
+			GameShell.clientTickTimes[var0] = 0L;
-		var0.rotation = var0.orientation;
+		}
+
+		ArchiveLoader.gameCyclesToDo = 0;
 	}
 }

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

@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ip")
+@ObfuscatedName("il")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("HealthBarDefinition_archive")
 	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("HitSplatDefinition_spritesArchive")
-	static AbstractArchive HitSplatDefinition_spritesArchive;
+	public static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("HealthBarDefinition_cached")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -2020710967
+		intValue = 1067342333
 	)
-	public int field3258;
+	public int field3265;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 2073172143
+		intValue = 2032079417
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1672807375
+		intValue = -1420994465
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1245763213
+		intValue = -601170319
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1160994935
+		intValue = 1370340653
 	)
 	@Export("int4")
 	public int int4;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2056406209
+		intValue = -197026089
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1546985657
+		intValue = -376766097
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1484247529
+		intValue = 1409027365
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2061624127
+		intValue = 1180776485
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1482399655
+		intValue = -975829671
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -108,10 +108,10 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lkl;I)V",
+		signature = "(Lkc;I)V",
-		garbageValue = "-1504288957"
+		garbageValue = "-276948452"
 	)
 	@Export("decode")
 	public void decode(Buffer var1) {
@@ -125,10 +125,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkl;IB)V",
+		signature = "(Lkc;II)V",
-		garbageValue = "2"
+		garbageValue = "431816555"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -145,9 +145,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method5453();
+			this.frontSpriteID = var1.method5638();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5453();
+			this.backSpriteID = var1.method5638();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -158,10 +158,10 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Llf;",
+		signature = "(I)Llx;",
-		garbageValue = "445043084"
+		garbageValue = "-907904185"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
@@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = NPCDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = MenuAction.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
@@ -182,10 +182,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)Llf;",
+		signature = "(I)Llx;",
-		garbageValue = "-62"
+		garbageValue = "1192801770"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
@@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = NPCDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = MenuAction.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
@@ -205,4 +205,71 @@ public class HealthBarDefinition extends DualNode {
 			}
 		}
 	}
+
+	@ObfuscatedName("ka")
+	@ObfuscatedSignature(
+		signature = "([Lhi;IB)V",
+		garbageValue = "-5"
+	)
+	@Export("drawModelComponents")
+	static final void drawModelComponents(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) {
+			Widget var3 = var0[var2];
+			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !WorldMapManager.isComponentHidden(var3))) {
+				if (var3.type == 0) {
+					if (!var3.isIf3 && WorldMapManager.isComponentHidden(var3) && var3 != ChatChannel.mousedOverWidgetIf1) {
+						continue;
+					}
+
+					drawModelComponents(var0, var3.id);
+					if (var3.children != null) {
+						drawModelComponents(var3.children, var3.id);
+					}
+
+					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
+					if (var4 != null) {
+						AbstractWorldMapData.method326(var4.group);
+					}
+				}
+
+				if (var3.type == 6) {
+					int var5;
+					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) {
+						boolean var7 = SecureRandomCallable.runCs1(var3);
+						if (var7) {
+							var5 = var3.sequenceId2;
+						} else {
+							var5 = var3.sequenceId;
+						}
+
+						if (var5 != -1) {
+							SequenceDefinition var6 = PlayerType.SequenceDefinition_get(var5);
+
+							for (var3.modelFrameCycle += Client.field693; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; GrandExchangeOfferAgeComparator.invalidateWidget(var3)) {
+								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
+								++var3.modelFrame;
+								if (var3.modelFrame >= var6.frameIds.length) {
+									var3.modelFrame -= var6.frameCount;
+									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
+										var3.modelFrame = 0;
+									}
+								}
+							}
+						}
+					}
+
+					if (var3.field2604 != 0 && !var3.isIf3) {
+						int var8 = var3.field2604 >> 16;
+						var5 = var3.field2604 << 16 >> 16;
+						var8 *= Client.field693;
+						var5 *= Client.field693;
+						var3.modelAngleX = var8 + var3.modelAngleX & 2047;
+						var3.modelAngleY = var5 + var3.modelAngleY & 2047;
+						GrandExchangeOfferAgeComparator.invalidateWidget(var3);
+					}
+				}
+			}
+		}
+
+	}
 }

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

@@ -4,32 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bq")
+@ObfuscatedName("bo")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
-	public static String field993;
-	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 2051178983
+		intValue = 2144411335
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -670451385
+		intValue = 1016663119
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -326291957
+		intValue = 487242031
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -809927427
+		intValue = 1175650203
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -41,10 +39,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "1094969728"
+		garbageValue = "-287168900"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -54,110 +52,31 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(III)Lbe;",
+		signature = "(III)I",
-		garbageValue = "776889337"
+		garbageValue = "212785133"
 	)
-	@Export("Messages_getByChannelAndID")
+	static final int method1880(int var0, int var1) {
-	static Message Messages_getByChannelAndID(int var0, int var1) {
+		if (var0 == -2) {
-		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
+			return 12345678;
-		return var2.getMessage(var1);
+		} else if (var0 == -1) {
-	}
+			if (var1 < 2) {
-
+				var1 = 2;
-	@ObfuscatedName("ff")
+			} else if (var1 > 126) {
-	@ObfuscatedSignature(
+				var1 = 126;
-		signature = "(I)V",
-		garbageValue = "146894465"
-	)
-	static final void method1769() {
-		for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
-			int var10002 = Client.queuedSoundEffectDelays[var0]--;
-			if (Client.queuedSoundEffectDelays[var0] >= -10) {
-				SoundEffect var9 = Client.soundEffects[var0];
-				if (var9 == null) {
-					Object var10000 = null;
-					var9 = SoundEffect.readSoundEffect(GrandExchangeOfferAgeComparator.archive4, Client.soundEffectIds[var0], 0);
-					if (var9 == null) {
-						continue;
-					}
-
-					int[] var13 = Client.queuedSoundEffectDelays;
-					var13[var0] += var9.calculateDelay();
-					Client.soundEffects[var0] = var9;
-				}
-
-				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 - class223.localPlayer.x;
-						if (var5 < 0) {
-							var5 = -var5;
-						}
-
-						int var6 = Client.soundLocations[var0] >> 8 & 255;
-						int var7 = var6 * 128 + 64 - class223.localPlayer.y;
-						if (var7 < 0) {
-							var7 = -var7;
-						}
-
-						int var8 = var5 + var7 - 128;
-						if (var8 > var3) {
-							Client.queuedSoundEffectDelays[var0] = -100;
-							continue;
-						}
-
-						if (var8 < 0) {
-							var8 = 0;
-						}
-
-						var2 = (var3 - var8) * Client.field868 / var3;
-					} else {
-						var2 = Client.soundEffectVolume;
-					}
-
-					if (var2 > 0) {
-						RawSound var10 = var9.toRawSound().resample(Interpreter.decimator);
-						RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
-						var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
-						WorldMapLabelSize.pcmStreamMixer.addSubStream(var11);
-					}
-
-					Client.queuedSoundEffectDelays[var0] = -100;
-				}
-			} else {
-				--Client.soundEffectCount;
-
-				for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
-					Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
-					Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
-					Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
-					Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1];
-					Client.soundLocations[var1] = Client.soundLocations[var1 + 1];
-				}
-
-				--var0;
 			}
+
+			return var1;
+		} else {
+			var1 = (var0 & 127) * var1 / 128;
+			if (var1 < 2) {
+				var1 = 2;
+			} else if (var1 > 126) {
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1;
 		}
-
-		if (Client.field759) {
-			boolean var12;
-			if (class197.field2386 != 0) {
-				var12 = true;
-			} else {
-				var12 = class49.midiPcmStream.isReady();
-			}
-
-			if (!var12) {
-				if (Client.field761 != 0 && Client.field666 != -1) {
-					class83.method2068(class225.archive6, Client.field666, 0, Client.field761, false);
-				}
-
-				Client.field759 = false;
-			}
-		}
-
 	}
 }

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

@@ -4,121 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iv")
+@ObfuscatedName("ii")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
 	@Export("HitSplatDefinition_archive")
-	public static AbstractArchive HitSplatDefinition_archive;
+	static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhq;"
 	)
-	@Export("HitSplatDefinition_fontsArchive")
+	static AbstractArchive field3316;
-	static AbstractArchive HitSplatDefinition_fontsArchive;
+	@ObfuscatedName("q")
-	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("HitSplatDefinition_cached")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
-	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
+	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Leb;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
-	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
+	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("es")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 290330035
+		intValue = 941598511
-	)
-	@Export("port1")
-	static int port1;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -135266261
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -296610035
+		intValue = -697129173
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 31719475
-	)
-	public int field3318;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -1509097345
-	)
-	int field3319;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -591877115
-	)
-	int field3332;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -2011301745
-	)
-	int field3321;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 1974829897
-	)
-	int field3322;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -87931297
-	)
-	public int field3323;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -577071813
-	)
-	public int field3311;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1569661547
-	)
-	public int field3325;
-	@ObfuscatedName("f")
-	String field3316;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 1618086973
-	)
-	public int field3327;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 1970000523
-	)
-	public int field3334;
-	@ObfuscatedName("l")
-	@Export("transforms")
-	public int[] transforms;
 	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 354517383
+		intValue = 2098099547
+	)
+	public int field3314;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = 1587744329
+	)
+	int field3321;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -559813503
+	)
+	int field3320;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1664346501
+	)
+	int field3323;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -798419301
+	)
+	int field3325;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = 1377626099
+	)
+	public int field3329;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1078350425
+	)
+	public int field3315;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = -328060003
+	)
+	public int field3327;
+	@ObfuscatedName("f")
+	String field3328;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 1213073095
+	)
+	public int field3313;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = 1353538745
+	)
+	public int field3330;
+	@ObfuscatedName("u")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1124290535
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -168749029
+		intValue = 1541441781
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -129,31 +122,31 @@ public class HitSplatDefinition extends DualNode {
 		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
 	}
 
-	public HitSplatDefinition() {
+	HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3318 = 70;
+		this.field3314 = 70;
-		this.field3319 = -1;
-		this.field3332 = -1;
 		this.field3321 = -1;
-		this.field3322 = -1;
+		this.field3320 = -1;
-		this.field3323 = 0;
+		this.field3323 = -1;
-		this.field3311 = 0;
 		this.field3325 = -1;
-		this.field3316 = "";
+		this.field3329 = 0;
+		this.field3315 = 0;
 		this.field3327 = -1;
-		this.field3334 = 0;
+		this.field3328 = "";
+		this.field3313 = -1;
+		this.field3330 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkl;B)V",
+		signature = "(Lkc;I)V",
-		garbageValue = "-110"
+		garbageValue = "1697924004"
 	)
 	@Export("decode")
-	public void decode(Buffer var1) {
+	void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -164,41 +157,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkl;II)V",
+		signature = "(Lkc;II)V",
-		garbageValue = "1800631473"
+		garbageValue = "149354669"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5453();
+			this.fontId = var1.method5638();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3319 = var1.method5453();
+			this.field3321 = var1.method5638();
 		} else if (var2 == 4) {
-			this.field3321 = var1.method5453();
+			this.field3323 = var1.method5638();
 		} else if (var2 == 5) {
-			this.field3332 = var1.method5453();
+			this.field3320 = var1.method5638();
 		} else if (var2 == 6) {
-			this.field3322 = var1.method5453();
+			this.field3325 = var1.method5638();
 		} else if (var2 == 7) {
-			this.field3323 = var1.readShort();
+			this.field3329 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3316 = var1.readStringCp1252NullCircumfixed();
+			this.field3328 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3318 = var1.readUnsignedShort();
+			this.field3314 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3311 = var1.readShort();
+			this.field3315 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3325 = 0;
+			this.field3327 = 0;
 		} else if (var2 == 12) {
-			this.field3327 = var1.readUnsignedByte();
+			this.field3313 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3334 = var1.readShort();
+			this.field3330 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3325 = var1.readUnsignedShort();
+			this.field3327 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -233,16 +226,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)Liv;",
+		signature = "(B)Lii;",
-		garbageValue = "723685"
+		garbageValue = "-47"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = WorldMapSprite.getVarbit(this.transformVarbit);
+			var1 = UserComparator9.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -254,36 +247,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		if (var2 != -1) {
+		return var2 != -1 ? NetFileRequest.method4298(var2) : null;
-			HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
-			HitSplatDefinition var3;
-			if (var4 != null) {
-				var3 = var4;
-			} else {
-				byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2);
-				var4 = new HitSplatDefinition();
-				if (var5 != null) {
-					var4.decode(new Buffer(var5));
-				}
-
-				HitSplatDefinition_cached.put(var4, (long)var2);
-				var3 = var4;
-			}
-
-			return var3;
-		} else {
-			return null;
-		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(IB)Ljava/lang/String;",
+		signature = "(II)Ljava/lang/String;",
-		garbageValue = "13"
+		garbageValue = "-121756337"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3316;
+		String var2 = this.field3328;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -291,62 +265,16 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + HealthBar.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + WorldMapData_0.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Llf;",
+		signature = "(I)Llx;",
-		garbageValue = "106816510"
+		garbageValue = "1012145117"
 	)
-	public Sprite method4520() {
+	public Sprite method4719() {
-		if (this.field3319 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3319);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3319, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3319);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(I)Llf;",
-		garbageValue = "-123360505"
-	)
-	public Sprite method4517() {
-		if (this.field3332 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3332, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(B)Llf;",
-		garbageValue = "88"
-	)
-	public Sprite method4518() {
 		if (this.field3321 < 0) {
 			return null;
 		} else {
@@ -354,7 +282,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3321, 0);
+				var1 = MenuAction.SpriteBuffer_getSprite(field3316, this.field3321, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3321);
 				}
@@ -364,22 +292,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)Llf;",
+		signature = "(B)Llx;",
-		garbageValue = "750571201"
+		garbageValue = "-59"
 	)
-	public Sprite method4542() {
+	public Sprite method4709() {
-		if (this.field3322 < 0) {
+		if (this.field3320 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3322);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3320);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3322, 0);
+				var1 = MenuAction.SpriteBuffer_getSprite(field3316, this.field3320, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3322);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3320);
 				}
 
 				return var1;
@@ -389,8 +317,54 @@ public class HitSplatDefinition extends DualNode {
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Lkn;",
+		signature = "(I)Llx;",
-		garbageValue = "-1418238828"
+		garbageValue = "477012988"
+	)
+	public Sprite method4710() {
+		if (this.field3323 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3323);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = MenuAction.SpriteBuffer_getSprite(field3316, this.field3323, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3323);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "(I)Llx;",
+		garbageValue = "-1187157829"
+	)
+	public Sprite method4731() {
+		if (this.field3325 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3325);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = MenuAction.SpriteBuffer_getSprite(field3316, this.field3325, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3325);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(B)Lks;",
+		garbageValue = "0"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -401,7 +375,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = ClanMate.method4976(GrandExchangeOfferNameComparator.field66, HitSplatDefinition_fontsArchive, this.fontId, 0);
+				var1 = class269.method5114(field3316, class2.HitSplatDefinition_fontsArchive, this.fontId, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
 				}
@@ -410,4 +384,170 @@ public class HitSplatDefinition extends DualNode {
 			}
 		}
 	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "10408118"
+	)
+	@Export("savePreferences")
+	static void savePreferences() {
+		AccessFile var0 = null;
+
+		try {
+			var0 = CollisionMap.getPreferencesFile("", MouseHandler.field458.name, true);
+			Buffer var1 = ScriptEvent.clientPreferences.toBuffer();
+			var0.write(var1.array, 0, var1.offset);
+		} catch (Exception var3) {
+		}
+
+		try {
+			if (var0 != null) {
+				var0.closeSync(true);
+			}
+		} catch (Exception var2) {
+		}
+
+	}
+
+	@ObfuscatedName("gw")
+	@ObfuscatedSignature(
+		signature = "(Lbz;IB)V",
+		garbageValue = "-26"
+	)
+	@Export("calculateActorPosition")
+	static final void calculateActorPosition(Actor var0, int var1) {
+		int var2;
+		if (var0.field925 > Client.cycle) {
+			WorldMapDecoration.method386(var0);
+		} else if (var0.field971 >= Client.cycle) {
+			if (var0.field971 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > PlayerType.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
+				var2 = var0.field971 - var0.field925;
+				int var3 = Client.cycle - var0.field925;
+				int var4 = var0.field966 * 128 + var0.field927 * 64;
+				int var5 = var0.field979 * 128 + var0.field927 * 64;
+				int var6 = var0.field967 * 128 + var0.field927 * 64;
+				int var7 = var0.field969 * 128 + var0.field927 * 64;
+				var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2;
+				var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2;
+			}
+
+			var0.field982 = 0;
+			var0.orientation = var0.field972;
+			var0.rotation = var0.orientation;
+		} else {
+			ModelData0.method3377(var0);
+		}
+
+		if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) {
+			var0.sequence = -1;
+			var0.spotAnimation = -1;
+			var0.field925 = 0;
+			var0.field971 = 0;
+			var0.x = var0.pathX[0] * 128 + var0.field927 * 64;
+			var0.y = var0.pathY[0] * 128 + var0.field927 * 64;
+			var0.method1862();
+		}
+
+		if (class215.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) {
+			var0.sequence = -1;
+			var0.spotAnimation = -1;
+			var0.field925 = 0;
+			var0.field971 = 0;
+			var0.x = var0.pathX[0] * 128 + var0.field927 * 64;
+			var0.y = var0.pathY[0] * 128 + var0.field927 * 64;
+			var0.method1862();
+		}
+
+		Actor.method1873(var0);
+		var0.isWalking = false;
+		SequenceDefinition var8;
+		if (var0.movementSequence != -1) {
+			var8 = PlayerType.SequenceDefinition_get(var0.movementSequence);
+			if (var8 != null && var8.frameIds != null) {
+				++var0.movementFrameCycle;
+				if (var0.movementFrame < var8.frameIds.length && var0.movementFrameCycle > var8.frameLengths[var0.movementFrame]) {
+					var0.movementFrameCycle = 1;
+					++var0.movementFrame;
+					Tile.addSequenceSoundEffect(var8, var0.movementFrame, var0.x, var0.y);
+				}
+
+				if (var0.movementFrame >= var8.frameIds.length) {
+					var0.movementFrameCycle = 0;
+					var0.movementFrame = 0;
+					Tile.addSequenceSoundEffect(var8, var0.movementFrame, var0.x, var0.y);
+				}
+			} else {
+				var0.movementSequence = -1;
+			}
+		}
+
+		if (var0.spotAnimation != -1 && Client.cycle >= var0.field973) {
+			if (var0.spotAnimationFrame < 0) {
+				var0.spotAnimationFrame = 0;
+			}
+
+			var2 = MenuAction.SpotAnimationDefinition_get(var0.spotAnimation).sequence;
+			if (var2 != -1) {
+				SequenceDefinition var9 = PlayerType.SequenceDefinition_get(var2);
+				if (var9 != null && var9.frameIds != null) {
+					++var0.spotAnimationFrameCycle;
+					if (var0.spotAnimationFrame < var9.frameIds.length && var0.spotAnimationFrameCycle > var9.frameLengths[var0.spotAnimationFrame]) {
+						var0.spotAnimationFrameCycle = 1;
+						++var0.spotAnimationFrame;
+						Tile.addSequenceSoundEffect(var9, var0.spotAnimationFrame, var0.x, var0.y);
+					}
+
+					if (var0.spotAnimationFrame >= var9.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var9.frameIds.length)) {
+						var0.spotAnimation = -1;
+					}
+				} else {
+					var0.spotAnimation = -1;
+				}
+			} else {
+				var0.spotAnimation = -1;
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
+			var8 = PlayerType.SequenceDefinition_get(var0.sequence);
+			if (var8.field3504 == 1 && var0.field983 > 0 && var0.field925 <= Client.cycle && var0.field971 < Client.cycle) {
+				var0.sequenceDelay = 1;
+				return;
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay == 0) {
+			var8 = PlayerType.SequenceDefinition_get(var0.sequence);
+			if (var8 != null && var8.frameIds != null) {
+				++var0.sequenceFrameCycle;
+				if (var0.sequenceFrame < var8.frameIds.length && var0.sequenceFrameCycle > var8.frameLengths[var0.sequenceFrame]) {
+					var0.sequenceFrameCycle = 1;
+					++var0.sequenceFrame;
+					Tile.addSequenceSoundEffect(var8, var0.sequenceFrame, var0.x, var0.y);
+				}
+
+				if (var0.sequenceFrame >= var8.frameIds.length) {
+					var0.sequenceFrame -= var8.frameCount;
+					++var0.field960;
+					if (var0.field960 >= var8.field3518) {
+						var0.sequence = -1;
+					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var8.frameIds.length) {
+						Tile.addSequenceSoundEffect(var8, var0.sequenceFrame, var0.x, var0.y);
+					} else {
+						var0.sequence = -1;
+					}
+				}
+
+				var0.isWalking = var8.field3514;
+			} else {
+				var0.sequence = -1;
+			}
+		}
+
+		if (var0.sequenceDelay > 0) {
+			--var0.sequenceDelay;
+		}
+
+	}
 }

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

@@ -7,34 +7,35 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("in")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "Lin;"
 	)
-	field3444(1, 0),
+	field3449(0, 0),
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "Lin;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(2, 1),
+	HorizontalAlignment_centered(1, 1),
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "Lin;"
 	)
-	field3442(0, 2);
+	field3447(2, 2);
 
+	@ObfuscatedName("i")
+	@Export("ByteArrayPool_arrays")
+	static byte[][][] ByteArrayPool_arrays;
 	@ObfuscatedName("q")
-	public static short[] field3447;
-	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 87636045
+		intValue = 1143014811
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1916297519
+		intValue = -510132141
 	)
 	@Export("id")
 	final int id;
@@ -44,10 +45,10 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(S)I",
+		signature = "(I)I",
-		garbageValue = "221"
+		garbageValue = "-1993081102"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {

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

@@ -1,18 +1,24 @@
 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("ht")
+@ObfuscatedName("hx")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("z")
+	@ObfuscatedName("as")
+	@ObfuscatedGetter(
+		intValue = 821038913
+	)
+	static int field2491;
+	@ObfuscatedName("a")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("keys")
 	int[] keys;
 
@@ -41,7 +47,7 @@ public class Huffman {
 
 					for (var10 = var6 - 1; var10 >= 1; --var10) {
 						var11 = var3[var10];
-						if (var8 != var11) {
+						if (var11 != var8) {
 							break;
 						}
 
@@ -99,10 +105,10 @@ public class Huffman {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "([BII[BII)I",
+		signature = "([BII[BIB)I",
-		garbageValue = "2067037926"
+		garbageValue = "14"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -120,7 +126,7 @@ public class Huffman {
 			int var11 = var7 >> 3;
 			int var12 = var7 & 7;
 			var6 &= -var12 >> 31;
-			int var13 = (var12 + var10 - 1 >> 3) + var11;
+			int var13 = (var10 + var12 - 1 >> 3) + var11;
 			var12 += 24;
 			var4[var11] = (byte)(var6 |= var9 >>> var12);
 			if (var11 < var13) {
@@ -150,10 +156,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([BI[BIII)I",
+		signature = "([BI[BIIB)I",
-		garbageValue = "98933619"
+		garbageValue = "-1"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -293,4 +299,26 @@ public class Huffman {
 			return var7 + 1 - var2;
 		}
 	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "([I[II)V",
+		garbageValue = "1107408934"
+	)
+	public static void method4104(int[] var0, int[] var1) {
+		if (var0 != null && var1 != null) {
+			ByteArrayPool.ByteArrayPool_alternativeSizes = var0;
+			class222.ByteArrayPool_altSizeArrayCounts = new int[var0.length];
+			HorizontalAlignment.ByteArrayPool_arrays = new byte[var0.length][][];
+
+			for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) {
+				HorizontalAlignment.ByteArrayPool_arrays[var2] = new byte[var1[var2]][];
+			}
+
+		} else {
+			ByteArrayPool.ByteArrayPool_alternativeSizes = null;
+			class222.ByteArrayPool_altSizeArrayCounts = null;
+			HorizontalAlignment.ByteArrayPool_arrays = null;
+		}
+	}
 }

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

@@ -4,54 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jw")
+@ObfuscatedName("je")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("hg")
+	@ObfuscatedName("hr")
 	@ObfuscatedGetter(
-		intValue = 1294899127
+		intValue = 1673577413
 	)
-	@Export("cameraPitch")
+	@Export("oculusOrbFocalPointX")
-	static int cameraPitch;
+	static int oculusOrbFocalPointX;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lli;"
+		signature = "Lln;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		signature = "(Lli;)V"
+		signature = "(Lln;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)Ljh;",
+		signature = "(I)Ljg;",
-		garbageValue = "2"
+		garbageValue = "-706396611"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljh;",
+		signature = "(II)[Ljg;",
-		garbageValue = "951526901"
+		garbageValue = "1510983955"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkl;IB)V",
+		signature = "(Lkc;IB)V",
-		garbageValue = "30"
+		garbageValue = "24"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -94,4 +94,635 @@ public class IgnoreList extends UserList {
 			return;
 		}
 	}
+
+	@ObfuscatedName("ja")
+	@ObfuscatedSignature(
+		signature = "([Lhi;IIIIIIIII)V",
+		garbageValue = "-564117353"
+	)
+	@Export("drawInterface")
+	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+
+		for (int var9 = 0; var9 < var0.length; ++var9) {
+			Widget var10 = var0[var9];
+			if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
+				int var11;
+				if (var8 == -1) {
+					Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
+					Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y;
+					Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width;
+					Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height;
+					var11 = ++Client.rootWidgetCount - 1;
+				} else {
+					var11 = var8;
+				}
+
+				var10.rootIndex = var11;
+				var10.cycle = Client.cycle;
+				if (!var10.isIf3 || !WorldMapManager.isComponentHidden(var10)) {
+					if (var10.contentType > 0) {
+						ArchiveDiskAction.method4297(var10);
+					}
+
+					int var12 = var10.x + var6;
+					int var13 = var7 + var10.y;
+					int var14 = var10.transparencyTop;
+					int var15;
+					int var16;
+					if (var10 == Client.clickedWidget) {
+						if (var1 != -1412584499 && !var10.isScrollBar) {
+							VarcInt.field3218 = var0;
+							TriBool.field3600 = var6;
+							GrandExchangeEvent.field46 = var7;
+							continue;
+						}
+
+						if (Client.isDraggingWidget && Client.field809) {
+							var15 = MouseHandler.MouseHandler_x;
+							var16 = MouseHandler.MouseHandler_y;
+							var15 -= Client.widgetClickX;
+							var16 -= Client.widgetClickY;
+							if (var15 < Client.field748) {
+								var15 = Client.field748;
+							}
+
+							if (var15 + var10.width > Client.field748 + Client.clickedWidgetParent.width) {
+								var15 = Client.field748 + Client.clickedWidgetParent.width - var10.width;
+							}
+
+							if (var16 < Client.field751) {
+								var16 = Client.field751;
+							}
+
+							if (var16 + var10.height > Client.field751 + Client.clickedWidgetParent.height) {
+								var16 = Client.field751 + Client.clickedWidgetParent.height - var10.height;
+							}
+
+							var12 = var15;
+							var13 = var16;
+						}
+
+						if (!var10.isScrollBar) {
+							var14 = 128;
+						}
+					}
+
+					int var17;
+					int var18;
+					int var19;
+					int var20;
+					int var21;
+					int var22;
+					if (var10.type == 2) {
+						var15 = var2;
+						var16 = var3;
+						var17 = var4;
+						var18 = var5;
+					} else if (var10.type == 9) {
+						var19 = var12;
+						var20 = var13;
+						var21 = var12 + var10.width;
+						var22 = var13 + var10.height;
+						if (var21 < var12) {
+							var19 = var21;
+							var21 = var12;
+						}
+
+						if (var22 < var13) {
+							var20 = var22;
+							var22 = var13;
+						}
+
+						++var21;
+						++var22;
+						var15 = var19 > var2 ? var19 : var2;
+						var16 = var20 > var3 ? var20 : var3;
+						var17 = var21 < var4 ? var21 : var4;
+						var18 = var22 < var5 ? var22 : var5;
+					} else {
+						var19 = var12 + var10.width;
+						var20 = var13 + var10.height;
+						var15 = var12 > var2 ? var12 : var2;
+						var16 = var13 > var3 ? var13 : var3;
+						var17 = var19 < var4 ? var19 : var4;
+						var18 = var20 < var5 ? var20 : var5;
+					}
+
+					if (!var10.isIf3 || var15 < var17 && var16 < var18) {
+						if (var10.contentType != 0) {
+							if (var10.contentType == 1336) {
+								if (Client.displayFps) {
+									var13 += 15;
+									ArchiveDiskActionHandler.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
+									var13 += 15;
+									Runtime var41 = Runtime.getRuntime();
+									var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L);
+									var21 = 16776960;
+									if (var20 > 327680 && !Client.isLowDetail) {
+										var21 = 16711680;
+									}
+
+									ArchiveDiskActionHandler.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
+									var13 += 15;
+								}
+								continue;
+							}
+
+							if (var10.contentType == 1337) {
+								Client.viewportX = var12;
+								Client.viewportY = var13;
+								WallDecoration.drawEntities(var12, var13, var10.width, var10.height);
+								Client.field842[var10.rootIndex] = true;
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+								continue;
+							}
+
+							if (var10.contentType == 1338) {
+								class4.drawMinimap(var10, var12, var13, var11);
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+								continue;
+							}
+
+							if (var10.contentType == 1339) {
+								PlayerType.drawCompass(var10, var12, var13, var11);
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+								continue;
+							}
+
+							if (var10.contentType == 1400) {
+								Login.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle);
+							}
+
+							if (var10.contentType == 1401) {
+								Login.worldMap.drawOverview(var12, var13, var10.width, var10.height);
+							}
+
+							if (var10.contentType == 1402) {
+								Login.loginScreenRunesAnimation.draw(var12, Client.cycle);
+							}
+						}
+
+						if (var10.type == 0) {
+							if (!var10.isIf3 && WorldMapManager.isComponentHidden(var10) && var10 != ChatChannel.mousedOverWidgetIf1) {
+								continue;
+							}
+
+							if (!var10.isIf3) {
+								if (var10.scrollY > var10.scrollHeight - var10.height) {
+									var10.scrollY = var10.scrollHeight - var10.height;
+								}
+
+								if (var10.scrollY < 0) {
+									var10.scrollY = 0;
+								}
+							}
+
+							drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+							if (var10.children != null) {
+								drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+							}
+
+							InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id);
+							if (var30 != null) {
+								ScriptEvent.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11);
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+							Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+						}
+
+						if (Client.isResizable || Client.field631[var11] || Client.gameDrawingMode > 1) {
+							if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
+								ArchiveLoader.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+							}
+
+							if (var10.type != 1) {
+								int var23;
+								int var24;
+								int var25;
+								int var26;
+								if (var10.type == 2) {
+									var19 = 0;
+
+									for (var20 = 0; var20 < var10.rawHeight; ++var20) {
+										for (var21 = 0; var21 < var10.rawWidth; ++var21) {
+											var22 = var12 + var21 * (var10.paddingX + 32);
+											var23 = var13 + var20 * (var10.paddingY + 32);
+											if (var19 < 20) {
+												var22 += var10.inventoryXOffsets[var19];
+												var23 += var10.inventoryYOffsets[var19];
+											}
+
+											if (var10.itemIds[var19] <= 0) {
+												if (var10.inventorySprites != null && var19 < 20) {
+													Sprite var43 = var10.getInventorySprite(var19);
+													if (var43 != null) {
+														var43.drawTransBgAt(var22, var23);
+													} else if (Widget.field2546) {
+														GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+													}
+												}
+											} else {
+												boolean var37 = false;
+												boolean var38 = false;
+												var26 = var10.itemIds[var19] - 1;
+												if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == GrandExchangeOffer.dragInventoryWidget && var19 == Client.dragItemSlotSource) {
+													Sprite var27;
+													if (Client.isItemSelected == 1 && var19 == MouseRecorder.selectedItemSlot && var10.id == MidiPcmStream.selectedItemWidget) {
+														var27 = ScriptEvent.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
+													} else {
+														var27 = ScriptEvent.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false);
+													}
+
+													if (var27 != null) {
+														if (var10 == GrandExchangeOffer.dragInventoryWidget && var19 == Client.dragItemSlotSource) {
+															var24 = MouseHandler.MouseHandler_x - Client.field729;
+															var25 = MouseHandler.MouseHandler_y - Client.field741;
+															if (var24 < 5 && var24 > -5) {
+																var24 = 0;
+															}
+
+															if (var25 < 5 && var25 > -5) {
+																var25 = 0;
+															}
+
+															if (Client.itemDragDuration < 5) {
+																var24 = 0;
+																var25 = 0;
+															}
+
+															var27.drawTransAt(var24 + var22, var25 + var23, 128);
+															if (var1 != -1) {
+																Widget var28 = var0[var1 & 65535];
+																int var29;
+																if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
+																	var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field693 / 3;
+																	if (var29 > Client.field693 * 10) {
+																		var29 = Client.field693 * 10;
+																	}
+
+																	if (var29 > var28.scrollY) {
+																		var29 = var28.scrollY;
+																	}
+
+																	var28.scrollY -= var29;
+																	Client.field741 += var29;
+																	GrandExchangeOfferAgeComparator.invalidateWidget(var28);
+																}
+
+																if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
+																	var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field693 / 3;
+																	if (var29 > Client.field693 * 10) {
+																		var29 = Client.field693 * 10;
+																	}
+
+																	if (var29 > var28.scrollHeight - var28.height - var28.scrollY) {
+																		var29 = var28.scrollHeight - var28.height - var28.scrollY;
+																	}
+
+																	var28.scrollY += var29;
+																	Client.field741 -= var29;
+																	GrandExchangeOfferAgeComparator.invalidateWidget(var28);
+																}
+															}
+														} else if (var10 == Login.field1165 && var19 == Client.field665) {
+															var27.drawTransAt(var22, var23, 128);
+														} else {
+															var27.drawTransBgAt(var22, var23);
+														}
+													} else {
+														GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+													}
+												}
+											}
+
+											++var19;
+										}
+									}
+								} else if (var10.type == 3) {
+									if (SecureRandomCallable.runCs1(var10)) {
+										var19 = var10.color2;
+										if (var10 == ChatChannel.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+											var19 = var10.mouseOverColor2;
+										}
+									} else {
+										var19 = var10.color;
+										if (var10 == ChatChannel.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+											var19 = var10.mouseOverColor;
+										}
+									}
+
+									if (var10.fill) {
+										switch(var10.fillMode.value) {
+										case 1:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
+											break;
+										case 2:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255));
+											break;
+										default:
+											if (var14 == 0) {
+												Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
+											} else {
+												Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255));
+											}
+										}
+									} else if (var14 == 0) {
+										Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
+									} else {
+										Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255));
+									}
+								} else {
+									Font var39;
+									if (var10.type == 4) {
+										var39 = var10.getFont();
+										if (var39 == null) {
+											if (Widget.field2546) {
+												GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+											}
+										} else {
+											String var45 = var10.text;
+											if (SecureRandomCallable.runCs1(var10)) {
+												var20 = var10.color2;
+												if (var10 == ChatChannel.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+													var20 = var10.mouseOverColor2;
+												}
+
+												if (var10.text2.length() > 0) {
+													var45 = var10.text2;
+												}
+											} else {
+												var20 = var10.color;
+												if (var10 == ChatChannel.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+													var20 = var10.mouseOverColor;
+												}
+											}
+
+											if (var10.isIf3 && var10.itemId != -1) {
+												ItemDefinition var46 = class222.ItemDefinition_get(var10.itemId);
+												var45 = var46.name;
+												if (var45 == null) {
+													var45 = "null";
+												}
+
+												if ((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
+													var45 = AbstractArchive.colorStartTag(16748608) + var45 + "</col>" + " " + 'x' + GrandExchangeOffer.formatItemStacks(var10.itemQuantity);
+												}
+											}
+
+											if (var10 == Client.meslayerContinueWidget) {
+												var45 = "Please wait...";
+												var20 = var10.color;
+											}
+
+											if (!var10.isIf3) {
+												var45 = class335.method6661(var45, var10);
+											}
+
+											var39.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
+										}
+									} else if (var10.type == 5) {
+										Sprite var40;
+										if (!var10.isIf3) {
+											var40 = var10.getSprite(SecureRandomCallable.runCs1(var10));
+											if (var40 != null) {
+												var40.drawTransBgAt(var12, var13);
+											} else if (Widget.field2546) {
+												GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+											}
+										} else {
+											if (var10.itemId != -1) {
+												var40 = ScriptEvent.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
+											} else {
+												var40 = var10.getSprite(false);
+											}
+
+											if (var40 == null) {
+												if (Widget.field2546) {
+													GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+												}
+											} else {
+												var20 = var40.width;
+												var21 = var40.height;
+												if (!var10.spriteTiling) {
+													var22 = var10.width * 4096 / var20;
+													if (var10.spriteAngle != 0) {
+														var40.method6266(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
+													} else if (var14 != 0) {
+														var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+													} else if (var20 == var10.width && var21 == var10.height) {
+														var40.drawTransBgAt(var12, var13);
+													} else {
+														var40.drawScaledAt(var12, var13, var10.width, var10.height);
+													}
+												} else {
+													Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
+													var22 = (var20 - 1 + var10.width) / var20;
+													var23 = (var21 - 1 + var10.height) / var21;
+
+													for (var24 = 0; var24 < var22; ++var24) {
+														for (var25 = 0; var25 < var23; ++var25) {
+															if (var10.spriteAngle != 0) {
+																var40.method6266(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
+															} else if (var14 != 0) {
+																var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
+															} else {
+																var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21);
+															}
+														}
+													}
+
+													Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+												}
+											}
+										}
+									} else {
+										ItemDefinition var34;
+										if (var10.type == 6) {
+											boolean var36 = SecureRandomCallable.runCs1(var10);
+											if (var36) {
+												var20 = var10.sequenceId2;
+											} else {
+												var20 = var10.sequenceId;
+											}
+
+											Model var42 = null;
+											var22 = 0;
+											if (var10.itemId != -1) {
+												var34 = class222.ItemDefinition_get(var10.itemId);
+												if (var34 != null) {
+													var34 = var34.getCountObj(var10.itemQuantity);
+													var42 = var34.getModel(1);
+													if (var42 != null) {
+														var42.calculateBoundsCylinder();
+														var22 = var42.height / 2;
+													} else {
+														GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+													}
+												}
+											} else if (var10.modelType == 5) {
+												if (var10.modelId == 0) {
+													var42 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+												} else {
+													var42 = class215.localPlayer.getModel();
+												}
+											} else if (var20 == -1) {
+												var42 = var10.getModel((SequenceDefinition)null, -1, var36, class215.localPlayer.appearance);
+												if (var42 == null && Widget.field2546) {
+													GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+												}
+											} else {
+												SequenceDefinition var47 = PlayerType.SequenceDefinition_get(var20);
+												var42 = var10.getModel(var47, var10.modelFrame, var36, class215.localPlayer.appearance);
+												if (var42 == null && Widget.field2546) {
+													GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+												}
+											}
+
+											Rasterizer3D.method3131(var10.width / 2 + var12, var10.height / 2 + var13);
+											var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
+											var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
+											if (var42 != null) {
+												if (!var10.isIf3) {
+													var42.method3044(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+												} else {
+													var42.calculateBoundsCylinder();
+													if (var10.modelOrthog) {
+														var42.method3046(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+													} else {
+														var42.method3044(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY);
+													}
+												}
+											}
+
+											Rasterizer3D.Rasterizer3D_method3();
+										} else {
+											if (var10.type == 7) {
+												var39 = var10.getFont();
+												if (var39 == null) {
+													if (Widget.field2546) {
+														GrandExchangeOfferAgeComparator.invalidateWidget(var10);
+													}
+													continue;
+												}
+
+												var20 = 0;
+
+												for (var21 = 0; var21 < var10.rawHeight; ++var21) {
+													for (var22 = 0; var22 < var10.rawWidth; ++var22) {
+														if (var10.itemIds[var20] > 0) {
+															var34 = class222.ItemDefinition_get(var10.itemIds[var20] - 1);
+															String var31;
+															if (var34.isStackable != 1 && var10.itemQuantities[var20] == 1) {
+																var31 = AbstractArchive.colorStartTag(16748608) + var34.name + "</col>";
+															} else {
+																var31 = AbstractArchive.colorStartTag(16748608) + var34.name + "</col>" + " " + 'x' + GrandExchangeOffer.formatItemStacks(var10.itemQuantities[var20]);
+															}
+
+															var25 = var12 + var22 * (var10.paddingX + 115);
+															var26 = (var10.paddingY + 12) * var21 + var13;
+															if (var10.textXAlignment == 0) {
+																var39.draw(var31, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else if (var10.textXAlignment == 1) {
+																var39.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else {
+																var39.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1);
+															}
+														}
+
+														++var20;
+													}
+												}
+											}
+
+											if (var10.type == 8 && var10 == GrandExchangeEvents.field39 && Client.field782 == Client.field783) {
+												var19 = 0;
+												var20 = 0;
+												Font var32 = ArchiveDiskActionHandler.fontPlain12;
+												String var33 = var10.text;
+
+												String var44;
+												for (var33 = class335.method6661(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) {
+													var24 = var33.indexOf("<br>");
+													if (var24 != -1) {
+														var44 = var33.substring(0, var24);
+														var33 = var33.substring(var24 + 4);
+													} else {
+														var44 = var33;
+														var33 = "";
+													}
+
+													var25 = var32.stringWidth(var44);
+													if (var25 > var19) {
+														var19 = var25;
+													}
+												}
+
+												var19 += 6;
+												var20 += 7;
+												var24 = var12 + var10.width - 5 - var19;
+												var25 = var13 + var10.height + 5;
+												if (var24 < var12 + 5) {
+													var24 = var12 + 5;
+												}
+
+												if (var19 + var24 > var4) {
+													var24 = var4 - var19;
+												}
+
+												if (var20 + var25 > var5) {
+													var25 = var5 - var20;
+												}
+
+												Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120);
+												Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0);
+												var33 = var10.text;
+												var26 = var25 + var32.ascent + 2;
+
+												for (var33 = class335.method6661(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) {
+													int var35 = var33.indexOf("<br>");
+													if (var35 != -1) {
+														var44 = var33.substring(0, var35);
+														var33 = var33.substring(var35 + 4);
+													} else {
+														var44 = var33;
+														var33 = "";
+													}
+
+													var32.draw(var44, var24 + 3, var26, 0, -1);
+												}
+											}
+
+											if (var10.type == 9) {
+												if (var10.field2641) {
+													var19 = var12;
+													var20 = var13 + var10.height;
+													var21 = var12 + var10.width;
+													var22 = var13;
+												} else {
+													var19 = var12;
+													var20 = var13;
+													var21 = var12 + var10.width;
+													var22 = var13 + var10.height;
+												}
+
+												if (var10.lineWid == 1) {
+													Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color);
+												} else {
+													UrlRequester.method3431(var19, var20, var21, var22, var10.color, var10.lineWid);
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+	}
 }

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

@@ -4,12 +4,15 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jn")
+@ObfuscatedName("ji")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("z")
+	@ObfuscatedName("pw")
+	@Export("ClanChat_inClanChat")
+	static boolean ClanChat_inClanChat;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -2093810797
+		intValue = 1062228261
 	)
 	@Export("id")
 	int id;
@@ -17,20 +20,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljn;I)I",
+		signature = "(Lji;B)I",
-		garbageValue = "1947810954"
+		garbageValue = "8"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		signature = "(Ljh;I)I",
+		signature = "(Ljg;I)I",
-		garbageValue = "-531306911"
+		garbageValue = "105019827"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -40,4 +43,27 @@ public class Ignored extends User {
 	public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1);
 	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(BI)C",
+		garbageValue = "-1328701707"
+	)
+	public static char method5284(byte var0) {
+		int var1 = var0 & 255;
+		if (var1 == 0) {
+			throw new IllegalArgumentException("" + Integer.toString(var1, 16));
+		} else {
+			if (var1 >= 128 && var1 < 160) {
+				char var2 = class287.cp1252AsciiExtension[var1 - 128];
+				if (var2 == 0) {
+					var2 = '?';
+				}
+
+				var1 = var2;
+			}
+
+			return (char)var1;
+		}
+	}
 }

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

@@ -2,35 +2,35 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("lp")
+@ObfuscatedName("lw")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("height")
 	public int height;
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) {
@@ -51,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) {
@@ -84,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
-	public void method6042(int var1, int var2, int var3, int var4) {
+	public void method6212(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth;
 		int var6 = this.subHeight;
 		int var7 = 0;
@@ -192,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("u")
+	@ObfuscatedName("q")
 	@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);
@@ -246,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@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("dk")
+@ObfuscatedName("da")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
 	@ObfuscatedName("f")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("j")
+	@ObfuscatedName("g")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("d")
+	@ObfuscatedName("w")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("k")
+	@ObfuscatedName("y")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lds;"
+		signature = "Ldz;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Ldd;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("t")
+	@ObfuscatedName("r")
 	@Export("offset")
 	int offset;
 
@@ -146,7 +146,7 @@ public class Instrument {
 		this.offset = 0;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
 		class300.clearIntArray(Instrument_samples, 0, var1);
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkl;)V"
+		signature = "(Lkc;)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.method2678(var1, this.filterEnvelope);
+		this.filter.method2852(var1, this.filterEnvelope);
 	}
 }

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

@@ -3,10 +3,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lk")
+@ObfuscatedName("le")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@Export("array")
 	int[] array;
 
@@ -32,10 +32,10 @@ public class IntHashTable {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "1278580700"
+		garbageValue = "464057567"
 	)
 	@Export("get")
 	public int get(int var1) {