Merge pull request #1592 from runelite-extended/rev-183

project: rev 183
2019-09-12 09:15:45 -04:00
parent b16a7de720 c6dc8af958
commit 320adb0a07
342 changed files with 41159 additions and 41469 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -89,13 +89,14 @@ allprojects {
    version = '1.5.33-SNAPSHOT'

    ext {
-        rsversion = 182
+        rsversion = 183
        cacheversion = 165
        plusVersion = '2.1.5.0'

        gitCommit = localGitCommit
        gitCommitShort = localGitCommitShort
        gitDirty = localGitDirty
+        

        rootPath = rootDir.toString().replace('\\', '/')
        injectedClassesPath = rootPath + "/injector-plugin/out/injected-client/"
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -1726,7 +1726,7 @@ public abstract class RSClientMixin implements RSClient
 	}

 	@Inject
-	BigInteger modulus = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16);
+	BigInteger modulus = new BigInteger("f8a2c48a898ebf7a2a5069193f0c6798757879d298af09a6fa94e569d45b09f67aeef8e6bb8a61650d597c743104fdef7d07b24af92df6be995877e9a7dd6a630d3e62c14e70427b959ff70735f96135d73434e73aabbd6aa8cf0b97dae7e2b6b70e646ff550b0ad8a4d8d18675714e5228b026d85e8f2f24607ba69d7404571", 16);

 	@Inject
 	@Override
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
@@ -166,6 +166,8 @@ public abstract class RSPlayerMixin implements RSPlayer
 			Vertex vy = triangle.getB();
 			Vertex vz = triangle.getC();

+			System.err.println("vx: " + vx.getX() + " localX: " + localX);
+
 			Point x = Perspective.localToCanvas(client,
 					localX - vx.getX(),
 					localY - vx.getZ(),
--- a/runescape-client/src/main/java/AbstractArchive.java
+++ b/runescape-client/src/main/java/AbstractArchive.java
@@ -7,72 +7,72 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("hz")
@Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Llc;"
+		signature = "Llu;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -894464741
+		intValue = 1302035663
 	)
 	static int field3120;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1986402315
+		intValue = -163352815
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lly;"
+		signature = "Llv;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "[Lly;"
+		signature = "[Llv;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@Export("files")
 	Object[][] files;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 2098544055
+		intValue = -1161826923
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("b")
+	@ObfuscatedName("e")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@Export("shallowFiles")
 	boolean shallowFiles;

@@ -86,10 +86,10 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([BB)V",
-		garbageValue = "64"
+		signature = "([BI)V",
+		garbageValue = "-1572277747"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
@@ -103,7 +103,7 @@ public abstract class AbstractArchive {

 		var5 = ~var5;
 		this.hash = var5;
-		Buffer var15 = new Buffer(Player.decompressBytes(var1));
+		Buffer var15 = new Buffer(TaskHandler.decompressBytes(var1));
 		var5 = var15.readUnsignedByte();
 		if (var5 >= 5 && var5 <= 7) {
 			if (var5 >= 6) {
@@ -112,7 +112,7 @@ public abstract class AbstractArchive {

 			var6 = var15.readUnsignedByte();
 			if (var5 >= 7) {
-				this.groupCount = var15.method5423();
+				this.groupCount = var15.method5481();
 			} else {
 				this.groupCount = var15.readUnsignedShort();
 			}
@@ -123,7 +123,7 @@ public abstract class AbstractArchive {
 			int var9;
 			if (var5 >= 7) {
 				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					this.groupIds[var9] = var7 += var15.method5423();
+					this.groupIds[var9] = var7 += var15.method5481();
 					if (this.groupIds[var9] > var8) {
 						var8 = this.groupIds[var9];
 					}
@@ -179,7 +179,7 @@ public abstract class AbstractArchive {
 					this.fileIds[var10] = new int[var11];

 					for (var13 = 0; var13 < var11; ++var13) {
-						var14 = this.fileIds[var10][var13] = var7 += var15.method5423();
+						var14 = this.fileIds[var10][var13] = var7 += var15.method5481();
 						if (var14 > var12) {
 							var12 = var14;
 						}
@@ -228,29 +228,29 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "502266240"
+		garbageValue = "-2104600002"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IIB)[B",
-		garbageValue = "127"
+		signature = "(III)[B",
+		garbageValue = "-852709847"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
 		return this.takeFileEncrypted(var1, var2, (int[])null);
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(II[II)[B",
-		garbageValue = "-1621987750"
+		garbageValue = "1856075294"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
@@ -266,7 +266,7 @@ public abstract class AbstractArchive {
 				}
 			}

-			byte[] var5 = class43.serialize(this.files[var1][var2], false);
+			byte[] var5 = MilliClock.serialize(this.files[var1][var2], false);
 			if (this.shallowFiles) {
 				this.files[var1][var2] = null;
 			}
@@ -277,10 +277,10 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(III)Z",
-		garbageValue = "187861364"
+		signature = "(IIB)Z",
+		garbageValue = "0"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
@@ -298,12 +298,12 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "1284781911"
+		signature = "(IB)Z",
+		garbageValue = "-49"
 	)
-	public boolean method4066(int var1) {
+	public boolean method4142(int var1) {
 		if (this.files.length == 1) {
 			return this.tryLoadFile(0, var1);
 		} else if (this.files[var1].length == 1) {
@@ -313,10 +313,10 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IS)Z",
-		garbageValue = "-29246"
+		signature = "(II)Z",
+		garbageValue = "1935370160"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
@@ -328,10 +328,10 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-855102923"
+		signature = "(B)Z",
+		garbageValue = "8"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
@@ -350,20 +350,20 @@ public abstract class AbstractArchive {
 		return var1;
 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-1902634670"
+		garbageValue = "780456172"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		return this.groups[var1] != null ? 100 : 0;
 	}

-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(II)[B",
-		garbageValue = "-108401953"
+		garbageValue = "-455222981"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
@@ -376,10 +376,10 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("f")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IIB)[B",
-		garbageValue = "99"
+		signature = "(III)[B",
+		garbageValue = "-518164691"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
@@ -395,17 +395,17 @@ public abstract class AbstractArchive {
 				}
 			}

-			byte[] var4 = class43.serialize(this.files[var1][var2], false);
+			byte[] var4 = MilliClock.serialize(this.files[var1][var2], false);
 			return var4;
 		} else {
 			return null;
 		}
 	}

-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(II)[B",
-		garbageValue = "-1767422605"
+		garbageValue = "-465347237"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
@@ -418,49 +418,49 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("r")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1800831619"
+		garbageValue = "2123503233"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 	}

-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(II)[I",
-		garbageValue = "1605042893"
+		signature = "(IB)[I",
+		garbageValue = "20"
 	)
 	@Export("getGroupFileIds")
 	public int[] getGroupFileIds(int var1) {
 		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null;
 	}

-	@ObfuscatedName("p")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-1967727419"
+		garbageValue = "1117618578"
 	)
 	@Export("getGroupFileCount")
 	public int getGroupFileCount(int var1) {
 		return this.files[var1].length;
 	}

-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-2"
+		garbageValue = "-57"
 	)
 	@Export("getGroupCount")
 	public int getGroupCount() {
 		return this.files.length;
 	}

-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(S)V",
-		garbageValue = "663"
+		signature = "(I)V",
+		garbageValue = "-460868159"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
@@ -470,10 +470,10 @@ public abstract class AbstractArchive {

 	}

-	@ObfuscatedName("z")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(IB)V",
-		garbageValue = "41"
+		garbageValue = "1"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
@@ -483,10 +483,10 @@ public abstract class AbstractArchive {

 	}

-	@ObfuscatedName("w")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-454602481"
+		garbageValue = "232551112"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
@@ -500,10 +500,10 @@ public abstract class AbstractArchive {

 	}

-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I[II)Z",
-		garbageValue = "-1201461238"
+		garbageValue = "-1481397744"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
@@ -527,14 +527,14 @@ public abstract class AbstractArchive {
 			} else {
 				byte[] var18;
 				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
-					var18 = class43.serialize(this.groups[var1], false);
+					var18 = MilliClock.serialize(this.groups[var1], false);
 				} else {
-					var18 = class43.serialize(this.groups[var1], true);
+					var18 = MilliClock.serialize(this.groups[var1], true);
 					Buffer var8 = new Buffer(var18);
 					var8.xteaDecrypt(var2, 5, var8.array.length);
 				}

-				byte[] var20 = Player.decompressBytes(var18);
+				byte[] var20 = TaskHandler.decompressBytes(var18);
 				if (this.releaseGroups) {
 					this.groups[var1] = null;
 				}
@@ -543,7 +543,7 @@ public abstract class AbstractArchive {
 					int var9 = var20.length;
 					--var9;
 					int var10 = var20[var9] & 255;
-					var9 -= var3 * var10 * 4;
+					var9 -= var10 * var3 * 4;
 					Buffer var11 = new Buffer(var20);
 					int[] var12 = new int[var3];
 					var11.offset = var9;
@@ -582,13 +582,13 @@ public abstract class AbstractArchive {

 					for (var15 = 0; var15 < var3; ++var15) {
 						if (!this.shallowFiles) {
-							var5[var4[var15]] = Entity.method3209(var19[var15], false);
+							var5[var4[var15]] = UserComparator8.method3365(var19[var15], false);
 						} else {
 							var5[var4[var15]] = var19[var15];
 						}
 					}
 				} else if (!this.shallowFiles) {
-					var5[var4[0]] = Entity.method3209(var20, false);
+					var5[var4[0]] = UserComparator8.method3365(var20, false);
 				} else {
 					var5[var4[0]] = var20;
 				}
@@ -598,109 +598,109 @@ public abstract class AbstractArchive {
 		}
 	}

-	@ObfuscatedName("h")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)I",
-		garbageValue = "1"
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "-1601715751"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
 		var1 = var1.toLowerCase();
-		return this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
+		return this.groupNameHashTable.get(Archive.hashString(var1));
 	}

-	@ObfuscatedName("v")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(ILjava/lang/String;I)I",
-		garbageValue = "-1503814186"
+		garbageValue = "-1748128959"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
 		var2 = var2.toLowerCase();
-		return this.fileNameHashTables[var1].get(ReflectionCheck.hashString(var2));
+		return this.fileNameHashTables[var1].get(Archive.hashString(var2));
 	}

-	@ObfuscatedName("m")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "1589930218"
+		garbageValue = "632147771"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
+		int var3 = this.groupNameHashTable.get(Archive.hashString(var1));
 		if (var3 < 0) {
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2));
+			int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2));
 			return var4 >= 0;
 		}
 	}

-	@ObfuscatedName("o")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;B)[B",
-		garbageValue = "34"
+		signature = "(Ljava/lang/String;Ljava/lang/String;I)[B",
+		garbageValue = "-977549436"
 	)
 	@Export("takeFileByNames")
 	public byte[] takeFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2));
+		int var3 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2));
 		return this.takeFile(var3, var4);
 	}

-	@ObfuscatedName("av")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "-823557765"
+		garbageValue = "1445366174"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2));
+		int var3 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2));
 		return this.tryLoadFile(var3, var4);
 	}

-	@ObfuscatedName("am")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)Z",
-		garbageValue = "11"
+		garbageValue = "-63"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
+		int var2 = this.groupNameHashTable.get(Archive.hashString(var1));
 		return this.tryLoadGroup(var2);
 	}

-	@ObfuscatedName("ai")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "1"
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-1117702662"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
+		int var2 = this.groupNameHashTable.get(Archive.hashString(var1));
 		if (var2 >= 0) {
 			this.loadRegionFromGroup(var2);
 		}
 	}

-	@ObfuscatedName("af")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)I",
-		garbageValue = "-43"
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "-1439788030"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1));
+		int var2 = this.groupNameHashTable.get(Archive.hashString(var1));
 		return this.groupLoadPercent(var2);
 	}
 }
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -1,225 +1,48 @@
 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("gl")
+@ObfuscatedName("gb")
@Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
+	@ObfuscatedName("hw")
+	@ObfuscatedGetter(
+		intValue = -996347373
+	)
+	@Export("oculusOrbFocalPointY")
+	static int oculusOrbFocalPointY;
+
 	AbstractByteArrayCopier() {
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)[B",
-		garbageValue = "-1040345200"
+		signature = "(B)[B",
+		garbageValue = "49"
 	)
 	@Export("get")
 	abstract byte[] get();

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "38240743"
+		garbageValue = "-1981176877"
 	)
 	@Export("set")
 	abstract void set(byte[] var1);

-	@ObfuscatedName("gq")
+	@ObfuscatedName("fj")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "53"
+		signature = "(I)V",
+		garbageValue = "-1334289648"
 	)
-	static void method3878() {
-		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
-			class80.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false);
+	static void method3922() {
+		if (GrandExchangeOfferUnitPriceComparator.worldMap != null) {
+			GrandExchangeOfferUnitPriceComparator.worldMap.method6275(MouseRecorder.plane, class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7), (Varps.localPlayer.y >> 7) + ScriptEvent.baseY, false);
+			GrandExchangeOfferUnitPriceComparator.worldMap.loadCache();
 		}

 	}
-
-	@ObfuscatedName("jf")
-	@ObfuscatedSignature(
-		signature = "(Lhp;II)I",
-		garbageValue = "-706781687"
-	)
-	static final int method3868(Widget var0, int var1) {
-		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
-			try {
-				int[] var2 = var0.cs1Instructions[var1];
-				int var3 = 0;
-				int var4 = 0;
-				byte var5 = 0;
-
-				while (true) {
-					int var6 = var2[var4++];
-					int var7 = 0;
-					byte var8 = 0;
-					if (var6 == 0) {
-						return var3;
-					}
-
-					if (var6 == 1) {
-						var7 = Client.currentLevels[var2[var4++]];
-					}
-
-					if (var6 == 2) {
-						var7 = Client.levels[var2[var4++]];
-					}
-
-					if (var6 == 3) {
-						var7 = Client.experience[var2[var4++]];
-					}
-
-					int var9;
-					Widget var10;
-					int var11;
-					int var12;
-					if (var6 == 4) {
-						var9 = var2[var4++] << 16;
-						var9 += var2[var4++];
-						var10 = WorldMapElement.getWidget(var9);
-						var11 = var2[var4++];
-						if (var11 != -1 && (!WorldMapData_0.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
-								if (var11 + 1 == var10.itemIds[var12]) {
-									var7 += var10.itemQuantities[var12];
-								}
-							}
-						}
-					}
-
-					if (var6 == 5) {
-						var7 = Varps.Varps_main[var2[var4++]];
-					}
-
-					if (var6 == 6) {
-						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
-					}
-
-					if (var6 == 7) {
-						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
-					}
-
-					if (var6 == 8) {
-						var7 = WorldMapIcon_1.localPlayer.combatLevel;
-					}
-
-					if (var6 == 9) {
-						for (var9 = 0; var9 < 25; ++var9) {
-							if (Skills.Skills_enabled[var9]) {
-								var7 += Client.levels[var9];
-							}
-						}
-					}
-
-					if (var6 == 10) {
-						var9 = var2[var4++] << 16;
-						var9 += var2[var4++];
-						var10 = WorldMapElement.getWidget(var9);
-						var11 = var2[var4++];
-						if (var11 != -1 && (!WorldMapData_0.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
-								if (var11 + 1 == var10.itemIds[var12]) {
-									var7 = 999999999;
-									break;
-								}
-							}
-						}
-					}
-
-					if (var6 == 11) {
-						var7 = Client.runEnergy;
-					}
-
-					if (var6 == 12) {
-						var7 = Client.weight;
-					}
-
-					if (var6 == 13) {
-						var9 = Varps.Varps_main[var2[var4++]];
-						int var13 = var2[var4++];
-						var7 = (var9 & 1 << var13) != 0 ? 1 : 0;
-					}
-
-					if (var6 == 14) {
-						var9 = var2[var4++];
-						var7 = class208.getVarbit(var9);
-					}
-
-					if (var6 == 15) {
-						var8 = 1;
-					}
-
-					if (var6 == 16) {
-						var8 = 2;
-					}
-
-					if (var6 == 17) {
-						var8 = 3;
-					}
-
-					if (var6 == 18) {
-						var7 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7);
-					}
-
-					if (var6 == 19) {
-						var7 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7);
-					}
-
-					if (var6 == 20) {
-						var7 = var2[var4++];
-					}
-
-					if (var8 == 0) {
-						if (var5 == 0) {
-							var3 += var7;
-						}
-
-						if (var5 == 1) {
-							var3 -= var7;
-						}
-
-						if (var5 == 2 && var7 != 0) {
-							var3 /= var7;
-						}
-
-						if (var5 == 3) {
-							var3 *= var7;
-						}
-
-						var5 = 0;
-					} else {
-						var5 = var8;
-					}
-				}
-			} catch (Exception var14) {
-				return -1;
-			}
-		} else {
-			return -2;
-		}
-	}
-
-	@ObfuscatedName("ky")
-	@ObfuscatedSignature(
-		signature = "(Lhp;I)Lhp;",
-		garbageValue = "-1890509802"
-	)
-	static Widget method3871(Widget var0) {
-		int var2 = ParamDefinition.getWidgetClickMask(var0);
-		int var1 = var2 >> 17 & 7;
-		int var3 = var1;
-		if (var1 == 0) {
-			return null;
-		} else {
-			for (int var4 = 0; var4 < var3; ++var4) {
-				var0 = WorldMapElement.getWidget(var0.parentId);
-				if (var0 == null) {
-					return null;
-				}
-			}
-
-			return var0;
-		}
-	}
 }
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -4,76 +4,76 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("kl")
+@ObfuscatedName("ko")
@Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "[Llq;"
+		signature = "[Llt;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
 	@ObfuscatedName("p")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("b")
+	@ObfuscatedName("e")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("a")
+	@ObfuscatedName("r")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("w")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@Export("kerning")
 	byte[] kerning;

@@ -91,6 +91,12 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_lines = new String[100];
 	}

+	AbstractFont(byte[] var1) {
+		this.pixels = new byte[256][];
+		this.ascent = 0;
+		this.readMetrics(var1);
+	}
+
 	AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
 		this.pixels = new byte[256][];
 		this.ascent = 0;
@@ -117,21 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.maxDescent = var9 - this.ascent;
 	}

-	AbstractFont(byte[] var1) {
-		this.pixels = new byte[256][];
-		this.ascent = 0;
-		this.readMetrics(var1);
-	}
-
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);

-	@ObfuscatedName("x")
+	@ObfuscatedName("u")
 	@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)method5255(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5336(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {

 	}

-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}

-		return this.advances[class14.charToByteCp1252(var1) & 255];
+		return this.advances[MenuAction.charToByteCp1252(var1) & 255];
 	}

-	@ObfuscatedName("c")
+	@ObfuscatedName("d")
 	@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 = WallDecoration.parseInt(var7.substring(4));
+										int var8 = IgnoreList.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)(class14.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(MenuAction.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("r")
+	@ObfuscatedName("z")
 	@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 = WallDecoration.parseInt(var16.substring(4));
+								int var17 = IgnoreList.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("y")
+	@ObfuscatedName("s")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -397,7 +397,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}

-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@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("z")
+	@ObfuscatedName("q")
 	@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("w")
+	@ObfuscatedName("r")
 	@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("l")
+	@ObfuscatedName("k")
 	@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("h")
+	@ObfuscatedName("w")
 	@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("v")
+	@ObfuscatedName("m")
 	@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("m")
+	@ObfuscatedName("o")
 	@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("o")
+	@ObfuscatedName("a")
 	@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("av")
+	@ObfuscatedName("b")
 	@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("am")
+	@ObfuscatedName("ag")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,38 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}

-	@ObfuscatedName("ai")
+	@ObfuscatedName("at")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
-			int var2;
-			String var3;
 			if (var1.startsWith("col=")) {
-				var3 = var1.substring(4);
-				var2 = Ignored.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_color = var2;
+				AbstractFont_color = GrandExchangeEvent.method74(var1.substring(4), 16);
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) {
-				var3 = var1.substring(4);
-				var2 = Ignored.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_strike = var2;
+				AbstractFont_strike = GrandExchangeEvent.method74(var1.substring(4), 16);
 			} else if (var1.equals("str")) {
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) {
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) {
-				var3 = var1.substring(2);
-				var2 = Ignored.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_underline = var2;
+				AbstractFont_underline = GrandExchangeEvent.method74(var1.substring(2), 16);
 			} else if (var1.equals("u")) {
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) {
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) {
-				var3 = var1.substring(5);
-				var2 = Ignored.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_shadow = var2;
+				AbstractFont_shadow = GrandExchangeEvent.method74(var1.substring(5), 16);
 			} else if (var1.equals("shad")) {
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) {
@@ -621,12 +611,12 @@ public abstract class AbstractFont extends Rasterizer2D {
 			} else if (var1.equals("br")) {
 				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
 			}
-		} catch (Exception var5) {
+		} catch (Exception var3) {
 		}

 	}

-	@ObfuscatedName("af")
+	@ObfuscatedName("ao")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -649,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D {

 	}

-	@ObfuscatedName("az")
+	@ObfuscatedName("av")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -658,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D {

 		for (int var6 = 0; var6 < var1.length(); ++var6) {
 			if (var1.charAt(var6) != 0) {
-				char var7 = (char)(class14.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(MenuAction.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -672,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) {
 								if (var8.startsWith("img=")) {
 									try {
-										var9 = WallDecoration.parseInt(var8.substring(4));
+										var9 = IgnoreList.parseInt(var8.substring(4));
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9];
 										var10.drawAt(var2, var3 + this.ascent - var10.height);
 										var2 += var10.width;
@@ -738,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D {

 	}

-	@ObfuscatedName("aj")
+	@ObfuscatedName("an")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -748,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D {

 		for (int var9 = 0; var9 < var1.length(); ++var9) {
 			if (var1.charAt(var9) != 0) {
-				char var10 = (char)(class14.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(MenuAction.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -777,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}

 										++var8;
-										var14 = WallDecoration.parseInt(var11.substring(4));
+										var14 = IgnoreList.parseInt(var11.substring(4));
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14];
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
 										var2 += var15.width;
@@ -856,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D {

 	}

-	@ObfuscatedName("d")
-	static int method5255(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	@ObfuscatedName("j")
+	static int method5336(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
 		int var7 = var2[var5];
 		int var8 = var7 + var4[var5];
 		int var9 = var2[var6];
@@ -892,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13;
 	}

-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length();
@@ -921,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}

-	@ObfuscatedName("an")
+	@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;
@@ -963,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}

-	@ObfuscatedName("at")
+	@ObfuscatedName("as")
 	@Export("AbstractFont_placeGlyph")
 	static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2);
@@ -1011,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D {

 	}

-	@ObfuscatedName("as")
+	@ObfuscatedName("ad")
 	@Export("AbstractFont_drawGlyphAlpha")
 	static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -1053,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}

-	@ObfuscatedName("ak")
+	@ObfuscatedName("ap")
 	@Export("AbstractFont_placeGlyphAlpha")
 	static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
 		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8;
--- a/runescape-client/src/main/java/AbstractRasterProvider.java
+++ b/runescape-client/src/main/java/AbstractRasterProvider.java
@@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("lg")
+@ObfuscatedName("lf")
@Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -436554829
+		intValue = 1812732741
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1168028289
+		intValue = -828006161
 	)
 	@Export("height")
 	public int height;
@@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "314023161"
+		garbageValue = "-978411495"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "333545527"
+		garbageValue = "-2009002566"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);

-	@ObfuscatedName("g")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1451326676"
+		garbageValue = "-934160158"
 	)
 	@Export("apply")
 	public final void apply() {
--- a/runescape-client/src/main/java/AbstractSocket.java
+++ b/runescape-client/src/main/java/AbstractSocket.java
@@ -4,67 +4,57 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("kg")
+@ObfuscatedName("ks")
@Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-1798752769"
+		signature = "(B)V",
+		garbageValue = "-75"
 	)
 	@Export("close")
 	public abstract void close();

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "547465689"
+		garbageValue = "1827163357"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "83"
+		signature = "(I)I",
+		garbageValue = "-1354053248"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "156087109"
+		garbageValue = "-377412375"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "([BIIB)I",
-		garbageValue = "100"
+		signature = "([BIII)I",
+		garbageValue = "2063129771"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
-		garbageValue = "638463675"
+		signature = "([BIIB)V",
+		garbageValue = "9"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(I)[Lkk;",
-		garbageValue = "2143260840"
-	)
-	@Export("ChatMode_values")
-	static PrivateChatMode[] ChatMode_values() {
-		return new PrivateChatMode[]{PrivateChatMode.field3790, PrivateChatMode.field3788, PrivateChatMode.field3793};
-	}
 }
--- a/runescape-client/src/main/java/AbstractSound.java
+++ b/runescape-client/src/main/java/AbstractSound.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;

-@ObfuscatedName("ds")
+@ObfuscatedName("di")
@Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("position")
 	int position;

--- a/runescape-client/src/main/java/AbstractUserComparator.java
+++ b/runescape-client/src/main/java/AbstractUserComparator.java
@@ -4,20 +4,20 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("je")
+@ObfuscatedName("jq")
@Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("nextComparator")
 	Comparator nextComparator;

 	protected AbstractUserComparator() {
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;B)V",
-		garbageValue = "102"
+		signature = "(Ljava/util/Comparator;I)V",
+		garbageValue = "-821671314"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator {

 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lju;Lju;I)I",
-		garbageValue = "760812985"
+		signature = "(Ljw;Ljw;B)I",
+		garbageValue = "-62"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -42,4 +42,23 @@ public abstract class AbstractUserComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		signature = "(B)Z",
+		garbageValue = "0"
+	)
+	@Export("isKeyDown")
+	public static final boolean isKeyDown() {
+		synchronized(KeyHandler.KeyHandler_instance) {
+			if (KeyHandler.field383 == KeyHandler.field381) {
+				return false;
+			} else {
+				class43.field361 = KeyHandler.field378[KeyHandler.field381];
+				WorldMapIcon_0.field126 = KeyHandler.field377[KeyHandler.field381];
+				KeyHandler.field381 = KeyHandler.field381 + 1 & 127;
+				return true;
+			}
+		}
+	}
 }
--- a/runescape-client/src/main/java/AbstractWorldMapData.java
+++ b/runescape-client/src/main/java/AbstractWorldMapData.java
@@ -5,108 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("l")
+@ObfuscatedName("w")
@Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -136523776
+		intValue = 1748127744
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1537560576
+		intValue = 1366642688
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -756440995
+		intValue = -59240115
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 2087702297
+		intValue = 1519130577
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -489051341
+		intValue = -101530507
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1972038717
+		intValue = -1450874669
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 156978213
+		intValue = 460144759
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1797648451
+		intValue = 977185489
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
+	@ObfuscatedName("n")
+	byte[][][] field163;
+	@ObfuscatedName("h")
+	byte[][][] field159;
 	@ObfuscatedName("f")
-	byte[][][] field145;
-	@ObfuscatedName("c")
-	byte[][][] field156;
-	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "[[[[Lo;"
+		signature = "[[[[Lb;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("y")
-	boolean field158;
+	@ObfuscatedName("s")
+	boolean field166;
 	@ObfuscatedName("p")
-	boolean field159;
+	boolean field167;

 	AbstractWorldMapData() {
 		this.groupId = -1;
 		this.fileId = -1;
 		new LinkedList();
-		this.field158 = false;
-		this.field159 = false;
+		this.field166 = false;
+		this.field167 = false;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lky;B)V",
-		garbageValue = "120"
+		signature = "(Lkz;I)V",
+		garbageValue = "-1969615810"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);

-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "-103"
+		signature = "(S)Z",
+		garbageValue = "2950"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field158 && this.field159;
+		return this.field166 && this.field167;
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Lhz;I)V",
-		garbageValue = "-1580621275"
+		signature = "(Lhz;B)V",
+		garbageValue = "20"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -114,53 +114,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
 			if (var2 != null) {
 				this.readGeography(new Buffer(var2));
-				this.field158 = true;
-				this.field159 = true;
+				this.field166 = true;
+				this.field167 = true;
 			}

 		}
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "2145144649"
+		garbageValue = "-266968977"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null;
 		this.floorOverlayIds = null;
-		this.field145 = null;
-		this.field156 = null;
+		this.field163 = null;
+		this.field159 = null;
 		this.decorations = null;
-		this.field158 = false;
-		this.field159 = false;
+		this.field166 = false;
+		this.field167 = false;
 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(IILky;I)V",
-		garbageValue = "1320309065"
+		signature = "(IILkz;I)V",
+		garbageValue = "1782766503"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte();
 		if (var4 != 0) {
 			if ((var4 & 1) != 0) {
-				this.method247(var1, var2, var3, var4);
+				this.method245(var1, var2, var3, var4);
 			} else {
-				this.method259(var1, var2, var3, var4);
+				this.method240(var1, var2, var3, var4);
 			}

 		}
 	}

-	@ObfuscatedName("d")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IILky;IB)V",
-		garbageValue = "85"
+		signature = "(IILkz;II)V",
+		garbageValue = "-1638058411"
 	)
-	void method247(int var1, int var2, Buffer var3, int var4) {
+	void method245(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0;
 		if (var5) {
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
@@ -169,12 +169,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
 	}

-	@ObfuscatedName("f")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(IILky;IS)V",
-		garbageValue = "320"
+		signature = "(IILkz;II)V",
+		garbageValue = "-1194656986"
 	)
-	void method259(int var1, int var2, Buffer var3, int var4) {
+	void method240(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1;
 		boolean var6 = (var4 & 2) != 0;
 		boolean var7 = (var4 & 4) != 0;
@@ -190,8 +190,8 @@ public abstract class AbstractWorldMapData {
 				if (var10 != 0) {
 					this.floorOverlayIds[var9][var1][var2] = (short)var10;
 					var11 = var3.readUnsignedByte();
-					this.field145[var9][var1][var2] = (byte)(var11 >> 2);
-					this.field156[var9][var1][var2] = (byte)(var11 & 3);
+					this.field163[var9][var1][var2] = (byte)(var11 >> 2);
+					this.field159[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -203,7 +203,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];

 					for (var11 = 0; var11 < var9; ++var11) {
-						int var12 = var3.method5602();
+						int var12 = var3.method5623();
 						int var13 = var3.readUnsignedByte();
 						var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
 					}
@@ -213,111 +213,156 @@ public abstract class AbstractWorldMapData {

 	}

-	@ObfuscatedName("c")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-88"
+		garbageValue = "35"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX;
 	}

-	@ObfuscatedName("r")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-79"
+		garbageValue = "-13"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IS)Ljava/lang/String;",
-		garbageValue = "30202"
+		signature = "(B)V",
+		garbageValue = "79"
 	)
-	static String method278(int var0) {
-		return "<img=" + var0 + ">";
+	static void method254() {
+		Tiles.Tiles_minPlane = 99;
+		Tiles.field476 = new byte[4][104][104];
+		class30.field257 = new byte[4][104][104];
+		Tiles.field477 = new byte[4][104][104];
+		HealthBar.field1089 = new byte[4][104][104];
+		UserComparator3.field1961 = new int[4][105][105];
+		Tiles.field473 = new byte[4][105][105];
+		class160.field1977 = new int[105][105];
+		UserComparator7.Tiles_hue = new int[104];
+		TileItem.Tiles_saturation = new int[104];
+		class1.Tiles_lightness = new int[104];
+		class42.Tiles_hueMultiplier = new int[104];
+		Tiles.field488 = new int[104];
 	}

-	@ObfuscatedName("gb")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "1514757872"
+		signature = "([Lbb;II[I[IB)V",
+		garbageValue = "-40"
 	)
-	static final void method264(int var0) {
-		int[] var1 = ParamDefinition.sceneMinimapSprite.pixels;
-		int var2 = var1.length;
+	@Export("sortWorlds")
+	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+		if (var1 < var2) {
+			int var5 = var1 - 1;
+			int var6 = var2 + 1;
+			int var7 = (var2 + var1) / 2;
+			World var8 = var0[var7];
+			var0[var7] = var0[var1];
+			var0[var1] = var8;

-		int var3;
-		for (var3 = 0; var3 < var2; ++var3) {
-			var1[var3] = 0;
-		}
+			while (var5 < var6) {
+				boolean var9 = true;

-		int var4;
-		int var5;
-		for (var3 = 1; var3 < 103; ++var3) {
-			var4 = (103 - var3) * 2048 + 24628;
+				int var10;
+				int var11;
+				int var12;
+				do {
+					--var6;

-			for (var5 = 1; var5 < 103; ++var5) {
-				if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) {
-					Player.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
-				}
+					for (var10 = 0; var10 < 4; ++var10) {
+						if (var3[var10] == 2) {
+							var11 = var0[var6].index;
+							var12 = var8.index;
+						} else if (var3[var10] == 1) {
+							var11 = var0[var6].population;
+							var12 = var8.population;
+							if (var11 == -1 && var4[var10] == 1) {
+								var11 = 2001;
+							}

-				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
-					Player.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
-				}
+							if (var12 == -1 && var4[var10] == 1) {
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) {
+							var11 = var0[var6].isMembersOnly() ? 1 : 0;
+							var12 = var8.isMembersOnly() ? 1 : 0;
+						} else {
+							var11 = var0[var6].id;
+							var12 = var8.id;
+						}

-				var4 += 4;
-			}
-		}
+						if (var11 != var12) {
+							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
+								var9 = false;
+							}
+							break;
+						}

-		var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10);
-		var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16;
-		ParamDefinition.sceneMinimapSprite.setRaster();
-
-		int var6;
-		for (var5 = 1; var5 < 103; ++var5) {
-			for (var6 = 1; var6 < 103; ++var6) {
-				if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) {
-					UserComparator10.drawObject(var0, var6, var5, var3, var4);
-				}
-
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) {
-					UserComparator10.drawObject(var0 + 1, var6, var5, var3, var4);
-				}
-			}
-		}
-
-		Client.mapIconCount = 0;
-
-		for (var5 = 0; var5 < 104; ++var5) {
-			for (var6 = 0; var6 < 104; ++var6) {
-				long var7 = Player.scene.getFloorDecorationTag(ItemContainer.plane, var5, var6);
-				if (var7 != 0L) {
-					int var9 = BoundaryObject.Entity_unpackID(var7);
-					int var10 = class215.getObjectDefinition(var9).mapIconId;
-					if (var10 >= 0) {
-						Client.mapIcons[Client.mapIconCount] = WorldMapData_0.WorldMapElement_get(var10).getSpriteBool(false);
-						Client.mapIconXs[Client.mapIconCount] = var5;
-						Client.mapIconYs[Client.mapIconCount] = var6;
-						++Client.mapIconCount;
+						if (var10 == 3) {
+							var9 = false;
+						}
 					}
+				} while(var9);
+
+				var9 = true;
+
+				do {
+					++var5;
+
+					for (var10 = 0; var10 < 4; ++var10) {
+						if (var3[var10] == 2) {
+							var11 = var0[var5].index;
+							var12 = var8.index;
+						} else if (var3[var10] == 1) {
+							var11 = var0[var5].population;
+							var12 = var8.population;
+							if (var11 == -1 && var4[var10] == 1) {
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) {
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) {
+							var11 = var0[var5].isMembersOnly() ? 1 : 0;
+							var12 = var8.isMembersOnly() ? 1 : 0;
+						} else {
+							var11 = var0[var5].id;
+							var12 = var8.id;
+						}
+
+						if (var11 != var12) {
+							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
+								var9 = false;
+							}
+							break;
+						}
+
+						if (var10 == 3) {
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				if (var5 < var6) {
+					World var13 = var0[var5];
+					var0[var5] = var0[var6];
+					var0[var6] = var13;
 				}
 			}
+
+			sortWorlds(var0, var1, var6, var3, var4);
+			sortWorlds(var0, var6 + 1, var2, var3, var4);
 		}

-		SpotAnimationDefinition.rasterProvider.apply();
-	}
-
-	@ObfuscatedName("kp")
-	@ObfuscatedSignature(
-		signature = "(IB)V",
-		garbageValue = "-61"
-	)
-	static void method272(int var0) {
-		Client.oculusOrbState = var0;
 	}
 }
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -3,85 +3,85 @@ 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("as")
+@ObfuscatedName("ap")
@Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("bi")
+	@ObfuscatedName("la")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Lhy;"
 	)
-	@Export("worldSelectLeftSprite")
-	static IndexedSprite worldSelectLeftSprite;
-	@ObfuscatedName("t")
+	static Widget field292;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		signature = "Lhj;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		signature = "Lhj;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 318036895
+		intValue = 870912939
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1985838427
+		intValue = -1786217753
 	)
 	@Export("screenY")
 	int screenY;

 	@ObfuscatedSignature(
-		signature = "(Lhd;Lhd;)V"
+		signature = "(Lhj;Lhj;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "78"
+		signature = "(I)I",
+		garbageValue = "861849893"
 	)
 	@Export("getElement")
 	public abstract int getElement();

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(B)Lai;",
-		garbageValue = "1"
+		signature = "(I)Lao;",
+		garbageValue = "1066707711"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1930584854"
+		garbageValue = "-1386026878"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-56"
+		signature = "(I)I",
+		garbageValue = "174908718"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();

-	@ObfuscatedName("g")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(III)Z",
-		garbageValue = "505598061"
+		signature = "(IIB)Z",
+		garbageValue = "1"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -92,36 +92,35 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}

-	@ObfuscatedName("e")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
-		garbageValue = "256"
+		signature = "(I)Z",
+		garbageValue = "1217113364"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}

-	@ObfuscatedName("z")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		signature = "(IIS)Z",
-		garbageValue = "-26498"
+		signature = "(III)Z",
+		garbageValue = "682818721"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = WorldMapData_0.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = WorldMapSection1.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) {
-					break;
+				if (var1 < this.screenX || var1 >= var4 + this.screenX) {
+					return false;
 				}
-
-				return false;
+				break;
 			case 1:
 				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
 					break;
@@ -136,18 +135,17 @@ public abstract class AbstractWorldMapIcon {

 			switch(var3.verticalAlignment.value) {
 			case 0:
-				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) {
-					break;
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+					return false;
 				}
-
-				return false;
+				break;
 			case 1:
 				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
 					return false;
 				}
 				break;
 			case 2:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
 					return false;
 				}
 			}
@@ -156,10 +154,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}

-	@ObfuscatedName("w")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
-		garbageValue = "66"
+		signature = "(IIS)Z",
+		garbageValue = "3172"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -173,15 +171,91 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}

+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(B)I",
+		garbageValue = "6"
+	)
+	static int method587() {
+		return 11;
+	}
+
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "261353448"
+		signature = "(ILcu;ZI)I",
+		garbageValue = "131093374"
 	)
-	static final void method591(String var0) {
-		StringBuilder var10000 = (new StringBuilder()).append(var0);
-		Object var10001 = null;
-		String var1 = var10000.append(" is already on your ignore list").toString();
-		DirectByteArrayCopier.addGameMessage(30, "", var1);
+	static int method576(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
+		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapElement.method4390(class60.getWidgetClickMask(var3));
+			return 1;
+		} else if (var0 != ScriptOpcodes.CC_GETOP) {
+			if (var0 == ScriptOpcodes.CC_GETOPBASE) {
+				if (var3.dataText == null) {
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+				} else {
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.dataText;
+				}
+
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			int var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			--var4;
+			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
+				Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.actions[var4];
+			} else {
+				Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+			}
+
+			return 1;
+		}
+	}
+
+	@ObfuscatedName("he")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "-1120874637"
+	)
+	static final void method572(int var0) {
+		if (var0 >= 0) {
+			int var1 = Client.menuArguments1[var0];
+			int var2 = Client.menuArguments2[var0];
+			int var3 = Client.menuOpcodes[var0];
+			int var4 = Client.menuIdentifiers[var0];
+			String var5 = Client.menuActions[var0];
+			String var6 = Client.menuTargets[var0];
+			EnumDefinition.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+		}
+	}
+
+	@ObfuscatedName("ii")
+	@ObfuscatedSignature(
+		signature = "(IIIIIIIIB)V",
+		garbageValue = "-109"
+	)
+	@Export("drawWidgets")
+	static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		if (TaskHandler.loadInterface(var0)) {
+			SoundCache.field1410 = null;
+			MusicPatchPcmStream.drawInterface(class289.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
+			if (SoundCache.field1410 != null) {
+				MusicPatchPcmStream.drawInterface(SoundCache.field1410, -1412584499, var1, var2, var3, var4, WorldMapSection0.field138, GrandExchangeOfferNameComparator.field79, var7);
+				SoundCache.field1410 = null;
+			}
+
+		} else {
+			if (var7 != -1) {
+				Client.field827[var7] = true;
+			} else {
+				for (int var8 = 0; var8 < 100; ++var8) {
+					Client.field827[var8] = true;
+				}
+			}
+
+		}
 	}
 }
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -9,23 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("mm")
+@ObfuscatedName("mr")
@Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("u")
-	static byte[][][] field4061;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		longValue = 6204556434071022947L
+		longValue = -7378543884552627951L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = 5275749299961116233L
+		longValue = 8243536028903450769L
 	)
 	@Export("offset")
 	long offset;
@@ -51,17 +49,17 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "160189816"
+		garbageValue = "1256704695"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
@@ -75,20 +73,20 @@ public final class AccessFile {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "18"
+		garbageValue = "-69"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(ZI)V",
-		garbageValue = "1818151820"
+		garbageValue = "2108341373"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -106,20 +104,20 @@ public final class AccessFile {

 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(I)J",
-		garbageValue = "2071750719"
+		signature = "(S)J",
+		garbageValue = "-3662"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "1749187322"
+		garbageValue = "-2055107083"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {
@@ -131,22 +129,6 @@ public final class AccessFile {
 		return var4;
 	}

-	protected void abi() throws Throwable {
-		if (this.file != null) {
-			System.out.println("");
-			this.close();
-		}
-
-	}
-
-	protected void abt() throws Throwable {
-		if (this.file != null) {
-			System.out.println("");
-			this.close();
-		}
-
-	}
-
 	protected void finalize() throws Throwable {
 		if (this.file != null) {
 			System.out.println("");
@@ -154,4 +136,12 @@ public final class AccessFile {
 		}

 	}
+
+	protected void aaj() throws Throwable {
+		if (this.file != null) {
+			System.out.println("");
+			this.close();
+		}
+
+	}
 }
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -4,327 +4,328 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("bu")
+@ObfuscatedName("be")
@Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("jm")
+	@ObfuscatedName("sy")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lbz;"
 	)
-	static Widget field978;
-	@ObfuscatedName("af")
+	@Export("clientPreferences")
+	static ClientPreferences clientPreferences;
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1884598383
+		intValue = -78439701
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("az")
-	@ObfuscatedGetter(
-		intValue = -1632465489
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("aj")
-	@ObfuscatedGetter(
-		intValue = -1372261855
-	)
-	@Export("rotation")
-	int rotation;
 	@ObfuscatedName("an")
 	@Export("isWalking")
 	boolean isWalking;
-	@ObfuscatedName("at")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -1570594880
+		intValue = 2024233319
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("as")
+	@ObfuscatedGetter(
+		intValue = -1344698339
+	)
+	@Export("rotation")
+	int rotation;
+	@ObfuscatedName("ad")
+	@ObfuscatedGetter(
+		intValue = 326208199
 	)
 	@Export("size")
 	int size;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 608219797
+		intValue = 1320061547
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -1134168353
+		intValue = 1628814929
 	)
 	@Export("readySequence")
 	int readySequence;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -1794207509
+		intValue = -1587131503
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = 1807906031
+		intValue = 38036755
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = 821150937
+		intValue = 195654645
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -346334565
+		intValue = 654548911
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = 2122224863
+		intValue = 2066786939
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -1158599439
+		intValue = 1924266197
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 1650224251
+		intValue = 146870157
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("aa")
 	@Export("overheadText")
 	String overheadText;
 	@ObfuscatedName("aq")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("ay")
-	boolean field926;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ar")
+	boolean field956;
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 319208211
+		intValue = -1539638005
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("al")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -1527605305
+		intValue = 291511261
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 611459225
+		intValue = -2008458145
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
 	@ObfuscatedName("aw")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("au")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bg")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bn")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bk")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bp")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bu")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		signature = "Ljd;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -666406559
+		intValue = 366180583
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bv")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bf")
 	@ObfuscatedGetter(
-		intValue = 1338126615
+		intValue = 1358121837
 	)
-	int field946;
-	@ObfuscatedName("bj")
+	int field945;
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = 221299857
+		intValue = 566824475
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = 669631645
+		intValue = 1646709317
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("by")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = 1550152873
+		intValue = -2010447121
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 236934275
+		intValue = -836151055
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 1446546153
+		intValue = -1593302173
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = 1633380255
+		intValue = -1376532773
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -159449897
+		intValue = -63500945
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bh")
 	@ObfuscatedGetter(
-		intValue = 1360808075
+		intValue = -303610771
 	)
-	int field964;
-	@ObfuscatedName("bm")
+	int field924;
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = -1209932375
+		intValue = -244355827
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = 1531272561
+		intValue = -1682160085
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = 1785825301
+		intValue = 377223135
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = -63871325
+		intValue = 249618635
 	)
-	int field958;
-	@ObfuscatedName("bt")
+	int field957;
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 130403319
+		intValue = -324063411
 	)
 	@Export("heightOffset")
 	int heightOffset;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = -446723661
+		intValue = -1424150703
 	)
-	int field960;
-	@ObfuscatedName("ba")
-	@ObfuscatedGetter(
-		intValue = 1274756773
-	)
-	int field961;
-	@ObfuscatedName("bg")
-	@ObfuscatedGetter(
-		intValue = 1683717067
-	)
-	int field954;
-	@ObfuscatedName("be")
-	@ObfuscatedGetter(
-		intValue = -1907051737
-	)
-	int field963;
+	int field959;
 	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = -356117007
+		intValue = 1789167897
 	)
-	int field941;
-	@ObfuscatedName("ce")
+	int field960;
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = -1458171567
+		intValue = 1809872347
+	)
+	int field961;
+	@ObfuscatedName("bx")
+	@ObfuscatedGetter(
+		intValue = -196012985
+	)
+	int field962;
+	@ObfuscatedName("bq")
+	@ObfuscatedGetter(
+		intValue = -854056355
+	)
+	int field963;
+	@ObfuscatedName("cb")
+	@ObfuscatedGetter(
+		intValue = 1429248265
+	)
+	int field964;
+	@ObfuscatedName("ct")
+	@ObfuscatedGetter(
+		intValue = 152429931
 	)
 	int field965;
-	@ObfuscatedName("ci")
+	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = 716061265
-	)
-	int field966;
-	@ObfuscatedName("ck")
-	@ObfuscatedGetter(
-		intValue = -1132398517
+		intValue = 766274575
 	)
 	@Export("npcCycle")
 	int npcCycle;
 	@ObfuscatedName("cc")
 	@ObfuscatedGetter(
-		intValue = -2023452361
+		intValue = -1552779633
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = 1438228269
+		intValue = -565463509
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cf")
+	@ObfuscatedName("cr")
 	@ObfuscatedGetter(
-		intValue = 1512808789
+		intValue = 715669973
 	)
-	int field970;
-	@ObfuscatedName("cw")
+	int field976;
+	@ObfuscatedName("cl")
 	@ObfuscatedGetter(
-		intValue = -1629005053
+		intValue = -1597126945
 	)
-	int field971;
-	@ObfuscatedName("cj")
+	int field953;
+	@ObfuscatedName("ca")
 	@ObfuscatedGetter(
-		intValue = -1777881517
+		intValue = 12984639
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("cp")
+	@ObfuscatedName("ck")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("cu")
+	@ObfuscatedName("cm")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("ce")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1405217673
+		intValue = 1459296501
 	)
-	int field976;
-	@ObfuscatedName("ch")
+	int field975;
+	@ObfuscatedName("cj")
 	@ObfuscatedGetter(
-		intValue = -1913917699
+		intValue = 1855180457
 	)
-	int field947;
+	int field969;

 	Actor() {
 		this.isWalking = false;
-		this.size = 64;
+		this.size = 1;
 		this.readySequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -334,7 +335,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field926 = false;
+		this.field956 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -347,7 +348,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field946 = -1;
+		this.field945 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -355,46 +356,46 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field964 = 0;
+		this.field924 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field970 = 0;
-		this.field971 = 32;
+		this.field976 = 0;
+		this.field953 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field976 = 0;
-		this.field947 = 0;
+		this.field975 = 0;
+		this.field969 = 0;
 	}

-	@ObfuscatedName("r")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(B)Z",
-		garbageValue = "-110"
+		garbageValue = "93"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}

-	@ObfuscatedName("aa")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1059295249"
+		garbageValue = "845208492"
 	)
-	final void method1671() {
+	final void method1699() {
 		this.pathLength = 0;
-		this.field947 = 0;
+		this.field969 = 0;
 	}

-	@ObfuscatedName("ap")
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "888431256"
+		garbageValue = "-2027410563"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -414,9 +415,9 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = StructDefinition.HitSplatDefinition_get(var1);
-			var10 = var12.field3323;
-			var11 = var12.field3314;
+			HitSplatDefinition var12 = Interpreter.HitSplatDefinition_get(var1);
+			var10 = var12.field3315;
+			var11 = var12.field3306;
 		}

 		int var14;
@@ -472,90 +473,267 @@ public abstract class Actor extends Entity {
 		}
 	}

-	@ObfuscatedName("aq")
+	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
 		signature = "(IIIIIIS)V",
-		garbageValue = "-25412"
+		garbageValue = "199"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var7 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1);
-		HealthBar var8 = null;
-		HealthBar var9 = null;
-		int var10 = var7.int2;
-		int var11 = 0;
+		HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+		HealthBarDefinition var7;
+		if (var8 != null) {
+			var7 = var8;
+		} else {
+			byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1);
+			var8 = new HealthBarDefinition();
+			if (var9 != null) {
+				var8.decode(new Buffer(var9));
+			}

-		HealthBar var12;
-		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) {
-			++var11;
-			if (var12.definition.field3264 == var7.field3264) {
-				var12.put(var2 + var4, var5, var6, var3);
+			HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1);
+			var7 = var8;
+		}
+
+		var8 = var7;
+		HealthBar var14 = null;
+		HealthBar var10 = null;
+		int var11 = var7.int2;
+		int var12 = 0;
+
+		HealthBar var13;
+		for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
+			++var12;
+			if (var13.definition.field3253 == var8.field3253) {
+				var13.put(var2 + var4, var5, var6, var3);
 				return;
 			}

-			if (var12.definition.int1 <= var7.int1) {
-				var8 = var12;
+			if (var13.definition.int1 <= var8.int1) {
+				var14 = var13;
 			}

-			if (var12.definition.int2 > var10) {
-				var9 = var12;
-				var10 = var12.definition.int2;
+			if (var13.definition.int2 > var11) {
+				var10 = var13;
+				var11 = var13.definition.int2;
 			}
 		}

-		if (var9 != null || var11 < 4) {
-			var12 = new HealthBar(var7);
-			if (var8 == null) {
-				this.healthBars.addLast(var12);
+		if (var10 != null || var12 < 4) {
+			var13 = new HealthBar(var8);
+			if (var14 == null) {
+				this.healthBars.addLast(var13);
 			} else {
-				IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8);
+				IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14);
 			}

-			var12.put(var2 + var4, var5, var6, var3);
-			if (var11 >= 4) {
-				var9.remove();
+			var13.put(var2 + var4, var5, var6, var3);
+			if (var12 >= 4) {
+				var10.remove();
 			}

 		}
 	}

-	@ObfuscatedName("ay")
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
 		signature = "(IB)V",
-		garbageValue = "1"
+		garbageValue = "99"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1);
+		HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+		HealthBarDefinition var2;
+		if (var3 != null) {
+			var2 = var3;
+		} else {
+			byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1);
+			var3 = new HealthBarDefinition();
+			if (var4 != null) {
+				var3.decode(new Buffer(var4));
+			}

-		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) {
-			if (var2 == var3.definition) {
-				var3.remove();
+			HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1);
+			var2 = var3;
+		}
+
+		var3 = var2;
+
+		for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
+			if (var3 == var5.definition) {
+				var5.remove();
 				return;
 			}
 		}

 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(II)Liz;",
-		garbageValue = "505249630"
+		signature = "(CI)Z",
+		garbageValue = "-599596211"
 	)
-	@Export("getInvDefinition")
-	public static InvDefinition getInvDefinition(int var0) {
-		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
-			var1 = new InvDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
+	@Export("isDigit")
+	public static boolean isDigit(char var0) {
+		return var0 >= '0' && var0 <= '9';
+	}
+
+	@ObfuscatedName("gk")
+	@ObfuscatedSignature(
+		signature = "(IIIII)V",
+		garbageValue = "1542615577"
+	)
+	static final void method1704(int var0, int var1, int var2, int var3) {
+		Client.overheadTextCount = 0;
+		boolean var4 = false;
+		int var5 = -1;
+		int var6 = -1;
+		int var7 = Players.Players_count;
+		int[] var8 = Players.Players_indices;
+
+		int var9;
+		for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
+			Object var10;
+			if (var9 < var7) {
+				var10 = Client.players[var8[var9]];
+				if (var8[var9] == Client.combatTargetPlayerIndex) {
+					var4 = true;
+					var5 = var9;
+					continue;
+				}
+
+				if (var10 == Varps.localPlayer) {
+					var6 = var9;
+					continue;
+				}
+			} else {
+				var10 = Client.npcs[Client.npcIndices[var9 - var7]];
 			}

-			InvDefinition.InvDefinition_cached.put(var1, (long)var0);
-			return var1;
+			VerticalAlignment.drawActor2d((Actor)var10, var9, var0, var1, var2, var3);
 		}
+
+		if (Client.renderSelf && var6 != -1) {
+			VerticalAlignment.drawActor2d(Varps.localPlayer, var6, var0, var1, var2, var3);
+		}
+
+		if (var4) {
+			VerticalAlignment.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3);
+		}
+
+		for (var9 = 0; var9 < Client.overheadTextCount; ++var9) {
+			int var19 = Client.overheadTextXs[var9];
+			int var11 = Client.overheadTextYs[var9];
+			int var12 = Client.overheadTextXOffsets[var9];
+			int var13 = Client.overheadTextAscents[var9];
+			boolean var14 = true;
+
+			while (var14) {
+				var14 = false;
+
+				for (int var15 = 0; var15 < var9; ++var15) {
+					if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXs[var15] + Client.overheadTextXOffsets[var15] && var12 + var19 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
+						var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15];
+						var14 = true;
+					}
+				}
+			}
+
+			Client.viewportTempX = Client.overheadTextXs[var9];
+			Client.viewportTempY = Client.overheadTextYs[var9] = var11;
+			String var20 = Client.overheadText[var9];
+			if (Client.chatEffects == 0) {
+				int var16 = 16776960;
+				if (Client.overheadTextColors[var9] < 6) {
+					var16 = Client.field838[Client.overheadTextColors[var9]];
+				}
+
+				if (Client.overheadTextColors[var9] == 6) {
+					var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
+				}
+
+				if (Client.overheadTextColors[var9] == 7) {
+					var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
+				}
+
+				if (Client.overheadTextColors[var9] == 8) {
+					var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
+				}
+
+				int var17;
+				if (Client.overheadTextColors[var9] == 9) {
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
+					if (var17 < 50) {
+						var16 = var17 * 1280 + 16711680;
+					} else if (var17 < 100) {
+						var16 = 16776960 - (var17 - 50) * 327680;
+					} else if (var17 < 150) {
+						var16 = (var17 - 100) * 5 + 65280;
+					}
+				}
+
+				if (Client.overheadTextColors[var9] == 10) {
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
+					if (var17 < 50) {
+						var16 = var17 * 5 + 16711680;
+					} else if (var17 < 100) {
+						var16 = 16711935 - (var17 - 50) * 327680;
+					} else if (var17 < 150) {
+						var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
+					}
+				}
+
+				if (Client.overheadTextColors[var9] == 11) {
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
+					if (var17 < 50) {
+						var16 = 16777215 - var17 * 327685;
+					} else if (var17 < 100) {
+						var16 = (var17 - 50) * 327685 + 65280;
+					} else if (var17 < 150) {
+						var16 = 16777215 - (var17 - 100) * 327680;
+					}
+				}
+
+				if (Client.overheadTextEffects[var9] == 0) {
+					HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
+				}
+
+				if (Client.overheadTextEffects[var9] == 1) {
+					HealthBar.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var9] == 2) {
+					HealthBar.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var9] == 3) {
+					HealthBar.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
+				}
+
+				if (Client.overheadTextEffects[var9] == 4) {
+					var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (HealthBar.fontBold12.stringWidth(var20) + 100) / 150;
+					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1);
+					HealthBar.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0);
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
+				}
+
+				if (Client.overheadTextEffects[var9] == 5) {
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
+					int var18 = 0;
+					if (var17 < 25) {
+						var18 = var17 - 25;
+					} else if (var17 > 125) {
+						var18 = var17 - 125;
+					}
+
+					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - HealthBar.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5);
+					HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0);
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
+				}
+			} else {
+				HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0);
+			}
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -3,51 +3,51 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("di")
+@ObfuscatedName("dx")
@Implements("Animation")
 public class Animation {
-	@ObfuscatedName("s")
-	static int[] field1619;
-	@ObfuscatedName("j")
-	static int[] field1615;
-	@ObfuscatedName("i")
-	static int[] field1624;
-	@ObfuscatedName("k")
-	static int[] field1617;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
+	static int[] field1603;
+	@ObfuscatedName("x")
+	static int[] field1612;
+	@ObfuscatedName("t")
+	static int[] field1604;
+	@ObfuscatedName("g")
+	static int[] field1602;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lex;"
+		signature = "Len;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;

 	static {
-		field1619 = new int[500];
-		field1615 = new int[500];
-		field1624 = new int[500];
-		field1617 = new int[500];
+		field1603 = new int[500];
+		field1612 = new int[500];
+		field1604 = new int[500];
+		field1602 = new int[500];
 	}

 	@ObfuscatedSignature(
-		signature = "([BLex;)V"
+		signature = "([BLen;)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) {
-							field1619[var7] = var10;
-							field1615[var7] = 0;
-							field1624[var7] = 0;
-							field1617[var7] = 0;
+							field1603[var7] = var10;
+							field1612[var7] = 0;
+							field1604[var7] = 0;
+							field1602[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}

-				field1619[var7] = var8;
+				field1603[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}

 				if ((var9 & 1) != 0) {
-					field1615[var7] = var4.readShortSmart();
+					field1612[var7] = var4.readShortSmart();
 				} else {
-					field1615[var7] = var11;
+					field1612[var7] = var11;
 				}

 				if ((var9 & 2) != 0) {
-					field1624[var7] = var4.readShortSmart();
+					field1604[var7] = var4.readShortSmart();
 				} else {
-					field1624[var7] = var11;
+					field1604[var7] = var11;
 				}

 				if ((var9 & 4) != 0) {
-					field1617[var7] = var4.readShortSmart();
+					field1602[var7] = var4.readShortSmart();
 				} else {
-					field1617[var7] = var11;
+					field1602[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] = field1619[var8];
-				this.transformXs[var8] = field1615[var8];
-				this.transformYs[var8] = field1624[var8];
-				this.transformZs[var8] = field1617[var8];
+				this.transformSkeletonLabels[var8] = field1603[var8];
+				this.transformXs[var8] = field1612[var8];
+				this.transformYs[var8] = field1604[var8];
+				this.transformZs[var8] = field1602[var8];
 			}

 		}
--- a/runescape-client/src/main/java/Archive.java
+++ b/runescape-client/src/main/java/Archive.java
@@ -5,88 +5,88 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("id")
+@ObfuscatedName("io")
@Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ao")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("h")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lkx;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lkx;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("m")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1228227843
+		intValue = 1156949557
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("o")
-	volatile boolean field3132;
-	@ObfuscatedName("av")
-	boolean field3133;
-	@ObfuscatedName("am")
+	@ObfuscatedName("b")
+	volatile boolean field3128;
+	@ObfuscatedName("ag")
+	boolean field3132;
+	@ObfuscatedName("at")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("af")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1456312337
+		intValue = -1676614799
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -1798815125
+		intValue = 1205835049
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -1710593501
+		intValue = 668240441
 	)
-	int field3131;
+	int field3137;

 	static {
 		Archive_crc = new CRC32();
 	}

 	@ObfuscatedSignature(
-		signature = "(Lkv;Lkv;IZZZ)V"
+		signature = "(Lkx;Lkx;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
+		this.field3128 = false;
 		this.field3132 = false;
-		this.field3133 = false;
-		this.field3131 = -1;
+		this.field3137 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3133 = var6;
+		this.field3132 = var6;
 		int var8 = this.index;
-		if (Decimator.NetCache_reference != null) {
-			Decimator.NetCache_reference.offset = var8 * 8 + 5;
-			int var9 = Decimator.NetCache_reference.readInt();
-			int var10 = Decimator.NetCache_reference.readInt();
+		if (DevicePcmPlayerProvider.NetCache_reference != null) {
+			DevicePcmPlayerProvider.NetCache_reference.offset = var8 * 8 + 5;
+			int var9 = DevicePcmPlayerProvider.NetCache_reference.readInt();
+			int var10 = DevicePcmPlayerProvider.NetCache_reference.readInt();
 			this.loadIndex(var9, var10);
 		} else {
-			BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
+			Varps.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
 			NetCache.NetCache_archives[var8] = this;
 		}

 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "502266240"
+		garbageValue = "-2104600002"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
@@ -99,10 +99,10 @@ public class Archive extends AbstractArchive {

 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-1902634670"
+		garbageValue = "780456172"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
@@ -114,8 +114,8 @@ public class Archive extends AbstractArchive {
 			int var3 = this.index;
 			long var4 = (long)((var3 << 16) + var1);
 			int var2;
-			if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) {
-				var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
+			if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var4) {
+				var2 = class336.NetCache_responseArchiveBuffer.offset * 99 / (class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
 			} else {
 				var2 = 0;
 			}
@@ -124,82 +124,91 @@ public class Archive extends AbstractArchive {
 		}
 	}

-	@ObfuscatedName("r")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1800831619"
+		garbageValue = "2123503233"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			WorldMapIcon_0.method191(var1, this.archiveDisk, this);
+			PlayerType.method4120(var1, this.archiveDisk, this);
 		} else {
-			BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			Varps.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
 		}

 	}

-	@ObfuscatedName("cs")
+	@ObfuscatedName("dh")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "581718104"
+		garbageValue = "1760954432"
 	)
-	public boolean method4177() {
-		return this.field3132;
+	public boolean method4265() {
+		return this.field3128;
 	}

-	@ObfuscatedName("co")
+	@ObfuscatedName("do")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-35"
+		signature = "(I)I",
+		garbageValue = "-185115723"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3132) {
+		if (this.field3128) {
 			return 100;
 		} else if (super.groups != null) {
 			return 99;
 		} else {
-			int var1 = class160.method3383(255, this.index);
-			if (var1 >= 100) {
-				var1 = 99;
+			int var2 = this.index;
+			long var3 = (long)(var2 + 16711680);
+			int var1;
+			if (NetCache.NetCache_currentResponse != null && var3 == NetCache.NetCache_currentResponse.key) {
+				var1 = class336.NetCache_responseArchiveBuffer.offset * 99 / (class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
+			} else {
+				var1 = 0;
 			}

-			return var1;
+			int var5 = var1;
+			if (var1 >= 100) {
+				var5 = 99;
+			}
+
+			return var5;
 		}
 	}

-	@ObfuscatedName("dr")
+	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
-		garbageValue = "-1"
+		signature = "(III)V",
+		garbageValue = "-288401160"
 	)
 	@Export("loadIndex")
 	void loadIndex(int var1, int var2) {
 		this.indexCrc = var1;
 		this.indexVersion = var2;
 		if (this.masterDisk != null) {
-			WorldMapIcon_0.method191(this.index, this.masterDisk, this);
+			PlayerType.method4120(this.index, this.masterDisk, this);
 		} else {
-			BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+			Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}

 	}

-	@ObfuscatedName("dd")
+	@ObfuscatedName("dy")
 	@ObfuscatedSignature(
 		signature = "(I[BZZB)V",
-		garbageValue = "-44"
+		garbageValue = "-101"
 	)
 	@Export("write")
 	void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3132) {
+			if (this.field3128) {
 				throw new RuntimeException();
 			}

 			if (this.masterDisk != null) {
-				GameShell.method1005(this.index, var2, this.masterDisk);
+				class96.method2259(this.index, var2, this.masterDisk);
 			}

 			this.decodeIndex(var2);
@@ -208,38 +217,38 @@ 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) {
-				GameShell.method1005(var1, var2, this.archiveDisk);
+				class96.method2259(var1, var2, this.archiveDisk);
 				this.validGroups[var1] = true;
 			}

 			if (var4) {
-				super.groups[var1] = Entity.method3209(var2, false);
+				super.groups[var1] = UserComparator8.method3365(var2, false);
 			}
 		}

 	}

-	@ObfuscatedName("dv")
+	@ObfuscatedName("dd")
 	@ObfuscatedSignature(
-		signature = "(Lkv;I[BZI)V",
-		garbageValue = "54929376"
+		signature = "(Lkx;I[BZI)V",
+		garbageValue = "-1896487213"
 	)
 	@Export("load")
 	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3132) {
+			if (this.field3128) {
 				throw new RuntimeException();
 			} else if (var3 == null) {
-				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 			} else {
 				Archive_crc.reset();
 				Archive_crc.update(var3, 0, var3.length);
 				var5 = (int)Archive_crc.getValue();
 				if (var5 != this.indexCrc) {
-					BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+					Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				} else {
-					Buffer var9 = new Buffer(Player.decompressBytes(var3));
+					Buffer var9 = new Buffer(TaskHandler.decompressBytes(var3));
 					int var7 = var9.readUnsignedByte();
 					if (var7 != 5 && var7 != 6) {
 						throw new RuntimeException(var7 + "," + this.index + "," + var2);
@@ -250,7 +259,7 @@ public class Archive extends AbstractArchive {
 						}

 						if (var8 != this.indexVersion) {
-							BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+							Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 						} else {
 							this.decodeIndex(var3);
 							this.loadAllLocal();
@@ -259,8 +268,8 @@ public class Archive extends AbstractArchive {
 				}
 			}
 		} else {
-			if (!var4 && var2 == this.field3131) {
-				this.field3132 = true;
+			if (!var4 && var2 == this.field3137) {
+				this.field3128 = true;
 			}

 			if (var3 != null && var3.length > 2) {
@@ -271,30 +280,30 @@ public class Archive extends AbstractArchive {
 				if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) {
 					this.validGroups[var2] = true;
 					if (var4) {
-						super.groups[var2] = Entity.method3209(var3, false);
+						super.groups[var2] = UserComparator8.method3365(var3, false);
 					}

 				} else {
 					this.validGroups[var2] = false;
-					if (this.field3133 || var4) {
-						BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					if (this.field3132 || var4) {
+						Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 					}

 				}
 			} else {
 				this.validGroups[var2] = false;
-				if (this.field3133 || var4) {
-					BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				if (this.field3132 || var4) {
+					Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}

 			}
 		}
 	}

-	@ObfuscatedName("da")
+	@ObfuscatedName("dp")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1518016463"
+		garbageValue = "-1002718108"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -306,46 +315,46 @@ public class Archive extends AbstractArchive {
 		}

 		if (this.archiveDisk == null) {
-			this.field3132 = true;
+			this.field3128 = true;
 		} else {
-			this.field3131 = -1;
+			this.field3137 = -1;

 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
-					BuddyRankComparator.method3376(var1, this.archiveDisk, this);
-					this.field3131 = var1;
+					Friend.method5190(var1, this.archiveDisk, this);
+					this.field3137 = var1;
 				}
 			}

-			if (this.field3131 == -1) {
-				this.field3132 = true;
+			if (this.field3137 == -1) {
+				this.field3128 = true;
 			}

 		}
 	}

-	@ObfuscatedName("dh")
+	@ObfuscatedName("dn")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "512289174"
+		garbageValue = "305356325"
 	)
-	public boolean method4185(int var1) {
+	public boolean method4283(int var1) {
 		return this.validGroups[var1];
 	}

-	@ObfuscatedName("dm")
+	@ObfuscatedName("de")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
-		garbageValue = "-5"
+		signature = "(II)Z",
+		garbageValue = "-1930544538"
 	)
-	public boolean method4199(int var1) {
+	public boolean method4261(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}

-	@ObfuscatedName("dj")
+	@ObfuscatedName("da")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "119"
+		garbageValue = "64"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -367,4 +376,21 @@ public class Archive extends AbstractArchive {
 			return var3;
 		}
 	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "1683994137"
+	)
+	@Export("hashString")
+	public static int hashString(CharSequence var0) {
+		int var1 = var0.length();
+		int var2 = 0;
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var2 = (var2 << 5) - var2 + MenuAction.charToByteCp1252(var0.charAt(var3));
+		}
+
+		return var2;
+	}
 }
--- a/runescape-client/src/main/java/ArchiveDisk.java
+++ b/runescape-client/src/main/java/ArchiveDisk.java
@@ -1,40 +1,44 @@
 import java.io.EOFException;
 import java.io.IOException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 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("kv")
+@ObfuscatedName("kx")
@Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("j")
+	@ObfuscatedName("db")
+	@ObfuscatedSignature(
+		signature = "Lio;"
+	)
+	@Export("archive11")
+	static Archive archive11;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "Lmw;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1905715445
-	)
-	@Export("archive")
-	int archive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "Lmw;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("u")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1039930471
+		intValue = -1914299203
+	)
+	@Export("archive")
+	int archive;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -1407150141
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -56,10 +60,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)[B",
-		garbageValue = "93"
+		signature = "(II)[B",
+		garbageValue = "-1665977739"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -90,7 +94,7 @@ public final class ArchiveDisk {
 								return (byte[])var10000;
 							}

-							this.datFile.seek(520L * (long)var4);
+							this.datFile.seek((long)var4 * 520L);
 							int var8 = var3 - var6;
 							int var9;
 							int var10;
@@ -121,7 +125,7 @@ public final class ArchiveDisk {
 								var12 = ArchiveDisk_buffer[7] & 255;
 							}

-							if (var9 != var1 || var7 != var10 || var12 != this.archive) {
+							if (var9 != var1 || var10 != var7 || var12 != this.archive) {
 								var10000 = null;
 								return (byte[])var10000;
 							}
@@ -150,10 +154,10 @@ public final class ArchiveDisk {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I[BII)Z",
-		garbageValue = "1937661421"
+		signature = "(I[BIB)Z",
+		garbageValue = "73"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -171,10 +175,10 @@ public final class ArchiveDisk {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I[BIZB)Z",
-		garbageValue = "16"
+		signature = "(I[BIZI)Z",
+		garbageValue = "1934021549"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -215,18 +219,18 @@ public final class ArchiveDisk {

 				while (true) {
 					if (var7 < var3) {
-						label171: {
+						label170: {
 							int var9 = 0;
 							int var10;
 							if (var4) {
-								this.datFile.seek(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								int var11;
 								int var12;
 								if (var1 > 65535) {
 									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);
@@ -237,7 +241,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);
@@ -246,7 +250,7 @@ public final class ArchiveDisk {
 									var12 = ArchiveDisk_buffer[7] & 255;
 								}

-								if (var10 != var1 || var11 != var8 || var12 != this.archive) {
+								if (var10 != var1 || var8 != var11 || var12 != this.archive) {
 									var10000 = false;
 									return var10000;
 								}
@@ -284,7 +288,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) {
@@ -306,7 +310,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[5] = (byte)(var9 >> 8);
 								ArchiveDisk_buffer[6] = (byte)var9;
 								ArchiveDisk_buffer[7] = (byte)this.archive;
-								this.datFile.seek(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								this.datFile.write(ArchiveDisk_buffer, 0, 8);
 								var10 = var3 - var7;
 								if (var10 > 512) {
@@ -332,62 +336,19 @@ public final class ArchiveDisk {
 		}
 	}

-	public String abd() {
+	public String aai() {
 		return "" + this.archive;
 	}

-	public String abb() {
-		return "" + this.archive * 1098163870;
+	public String aan() {
+		return "" + this.archive;
 	}

 	public String toString() {
 		return "" + this.archive;
 	}

-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(Lfu;III)Ldd;",
-		garbageValue = "670296930"
-	)
-	public static final PcmPlayer method5757(TaskHandler var0, int var1, int var2) {
-		if (PcmPlayer.PcmPlayer_sampleRate == 0) {
-			throw new IllegalStateException();
-		} else if (var1 >= 0 && var1 < 2) {
-			if (var2 < 256) {
-				var2 = 256;
-			}
-
-			try {
-				PcmPlayer var3 = SecureRandomCallable.pcmPlayerProvider.player();
-				var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256];
-				var3.field1399 = var2;
-				var3.init();
-				var3.capacity = (var2 & -1024) + 1024;
-				if (var3.capacity > 16384) {
-					var3.capacity = 16384;
-				}
-
-				var3.open(var3.capacity);
-				if (FloorDecoration.PcmPlayer_count > 0 && PacketBufferNode.soundSystem == null) {
-					PacketBufferNode.soundSystem = new SoundSystem();
-					GrandExchangeOfferWorldComparator.soundSystemExecutor = Executors.newScheduledThreadPool(1);
-					GrandExchangeOfferWorldComparator.soundSystemExecutor.scheduleAtFixedRate(PacketBufferNode.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
-				}
-
-				if (PacketBufferNode.soundSystem != null) {
-					if (PacketBufferNode.soundSystem.players[var1] != null) {
-						throw new IllegalArgumentException();
-					}
-
-					PacketBufferNode.soundSystem.players[var1] = var3;
-				}
-
-				return var3;
-			} catch (Throwable var4) {
-				return new PcmPlayer();
-			}
-		} else {
-			throw new IllegalArgumentException();
-		}
+	public String aar() {
+		return "" + this.archive * 1578141934;
 	}
 }
--- a/runescape-client/src/main/java/ArchiveDiskAction.java
+++ b/runescape-client/src/main/java/ArchiveDiskAction.java
@@ -4,31 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("hn")
+@ObfuscatedName("hw")
@Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1794438743
+		intValue = -1482898201
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("data")
 	byte[] data;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lkx;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lid;"
+		signature = "Lio;"
 	)
 	@Export("archive")
 	Archive archive;

 	ArchiveDiskAction() {
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(II)Ljava/lang/String;",
+		garbageValue = "-1111446859"
+	)
+	static String method4133(int var0) {
+		return "<img=" + var0 + ">";
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "([BIII)Ljava/lang/String;",
+		garbageValue = "-90955785"
+	)
+	public static String method4132(byte[] var0, int var1, int var2) {
+		char[] var3 = new char[var2];
+		int var4 = 0;
+		int var5 = var1;
+
+		int var8;
+		for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) {
+			int var7 = var0[var5++] & 255;
+			if (var7 < 128) {
+				if (var7 == 0) {
+					var8 = 65533;
+				} else {
+					var8 = var7;
+				}
+			} else if (var7 < 192) {
+				var8 = 65533;
+			} else if (var7 < 224) {
+				if (var5 < var6 && (var0[var5] & 192) == 128) {
+					var8 = (var7 & 31) << 6 | var0[var5++] & 63;
+					if (var8 < 128) {
+						var8 = 65533;
+					}
+				} else {
+					var8 = 65533;
+				}
+			} else if (var7 < 240) {
+				if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) {
+					var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63;
+					if (var8 < 2048) {
+						var8 = 65533;
+					}
+				} else {
+					var8 = 65533;
+				}
+			} else if (var7 < 248) {
+				if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) {
+					var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63;
+					if (var8 >= 65536 && var8 <= 1114111) {
+						var8 = 65533;
+					} else {
+						var8 = 65533;
+					}
+				} else {
+					var8 = 65533;
+				}
+			} else {
+				var8 = 65533;
+			}
+		}
+
+		return new String(var3, 0, var4);
+	}
 }
--- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java
+++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
@@ -4,34 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("iw")
+@ObfuscatedName("ib")
@Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ljc;"
+		signature = "Ljv;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
 	static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Ljc;"
+		signature = "Ljv;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
 	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("i")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 587142169
+		intValue = 1435645163
 	)
-	static int field3124;
-	@ObfuscatedName("k")
+	public static int field3126;
+	@ObfuscatedName("l")
 	@Export("ArchiveDiskActionHandler_lock")
-	static Object ArchiveDiskActionHandler_lock;
+	public static Object ArchiveDiskActionHandler_lock;
+	@ObfuscatedName("u")
+	@Export("ArchiveDiskActionHandler_thread")
+	static Thread ArchiveDiskActionHandler_thread;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "Lhz;"
+	)
+	@Export("Widget_archive")
+	static AbstractArchive Widget_archive;

 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3124 = 0;
+		field3126 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}

@@ -60,45 +69,46 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}

 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3124 <= 1) {
-							field3124 = 0;
+						if (field3126 <= 1) {
+							field3126 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}

-						field3124 = 600;
+						field3126 = 600;
 					}
 				} else {
-					UserList.sleepMillis(100L);
+					FriendsList.sleepMillis(100L);
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3124 <= 1) {
-							field3124 = 0;
+						if (field3126 <= 1) {
+							field3126 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}

-						--field3124;
+						--field3126;
 					}
 				}
 			}
 		} catch (Exception var13) {
-			class3.RunException_sendStackTrace((String)null, var13);
+			class188.RunException_sendStackTrace((String)null, var13);
 		}
 	}

-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(CB)Z",
-		garbageValue = "-108"
+		signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lma;"
 	)
-	@Export("isCharPrintable")
-	public static boolean isCharPrintable(char var0) {
-		if (var0 >= ' ' && var0 <= '~') {
-			return true;
-		} else if (var0 >= 160 && var0 <= 255) {
-			return true;
+	@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 {
-			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
+			var2 = new RunException(var0, var1);
 		}
+
+		return var2;
 	}
 }
--- a/runescape-client/src/main/java/ArchiveLoader.java
+++ b/runescape-client/src/main/java/ArchiveLoader.java
@@ -3,37 +3,62 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("bh")
+@ObfuscatedName("bv")
@Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "Lkb;"
-	)
-	@Export("ItemDefinition_fontPlain11")
-	static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("j")
+	@ObfuscatedName("nd")
 	@ObfuscatedGetter(
-		intValue = -1407926591
+		intValue = -1623387895
 	)
-	@Export("groupCount")
-	final int groupCount;
-	@ObfuscatedName("i")
+	@Export("widgetDragDuration")
+	static int widgetDragDuration;
+	@ObfuscatedName("sx")
+	@ObfuscatedGetter(
+		intValue = -1229165351
+	)
+	@Export("foundItemIndex")
+	static int foundItemIndex;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -1875812039
+	)
+	static int field510;
+	@ObfuscatedName("eg")
+	@Export("worldHost")
+	static String worldHost;
+	@ObfuscatedName("fe")
 	@ObfuscatedSignature(
-		signature = "Lid;"
+		signature = "Lks;"
+	)
+	static AbstractSocket field512;
+	@ObfuscatedName("go")
+	@ObfuscatedGetter(
+		intValue = -652150827
+	)
+	static int field508;
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "Lio;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2082038361
+		intValue = -1519742751
+	)
+	@Export("groupCount")
+	final int groupCount;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 1438963135
 	)
 	@Export("loadedCount")
 	int loadedCount;

 	@ObfuscatedSignature(
-		signature = "(Lid;Ljava/lang/String;)V"
+		signature = "(Lio;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -41,17 +66,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "273857318"
+		garbageValue = "-856910986"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;

 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4199(var1) || this.archive.method4185(var1)) {
+			if (!this.archive.method4261(var1) || this.archive.method4283(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -59,53 +84,251 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(II)Lcr;",
-		garbageValue = "-332369983"
+		signature = "(Lkt;II)V",
+		garbageValue = "593682033"
 	)
-	@Export("getScript")
-	static Script getScript(int var0) {
-		Script var1 = (Script)Script.Script_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = GameShell.archive12.takeFile(var0, 0);
-			if (var2 == null) {
-				return null;
+	@Export("readPlayerUpdate")
+	static void readPlayerUpdate(PacketBuffer var0, int var1) {
+		boolean var2 = var0.readBits(1) == 1;
+		if (var2) {
+			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+		}
+
+		int var3 = var0.readBits(2);
+		Player var4 = Client.players[var1];
+		if (var3 == 0) {
+			if (var2) {
+				var4.field607 = false;
+			} else if (Client.localPlayerIndex == var1) {
+				throw new RuntimeException();
 			} else {
-				var1 = DesktopPlatformInfoProvider.newScript(var2);
-				Script.Script_cached.put(var1, (long)var0);
-				return var1;
+				Players.Players_regions[var1] = (var4.plane << 28) + (class4.baseX * 64 + var4.pathX[0] >> 13 << 14) + (ScriptEvent.baseY + var4.pathY[0] >> 13);
+				if (var4.field945 != -1) {
+					Players.Players_orientations[var1] = var4.field945;
+				} else {
+					Players.Players_orientations[var1] = var4.orientation;
+				}
+
+				Players.Players_targetIndices[var1] = var4.targetIndex;
+				Client.players[var1] = null;
+				if (var0.readBits(1) != 0) {
+					Message.updateExternalPlayer(var0, var1);
+				}
+
+			}
+		} else {
+			int var5;
+			int var6;
+			int var7;
+			if (var3 == 1) {
+				var5 = var0.readBits(3);
+				var6 = var4.pathX[0];
+				var7 = var4.pathY[0];
+				if (var5 == 0) {
+					--var6;
+					--var7;
+				} else if (var5 == 1) {
+					--var7;
+				} else if (var5 == 2) {
+					++var6;
+					--var7;
+				} else if (var5 == 3) {
+					--var6;
+				} else if (var5 == 4) {
+					++var6;
+				} else if (var5 == 5) {
+					--var6;
+					++var7;
+				} else if (var5 == 6) {
+					++var7;
+				} else if (var5 == 7) {
+					++var6;
+					++var7;
+				}
+
+				if (Client.localPlayerIndex == var1 && (var4.x * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) {
+					var4.resetPath(var6, var7);
+					var4.field607 = false;
+				} else if (var2) {
+					var4.field607 = true;
+					var4.tileX = var6;
+					var4.tileY = var7;
+				} else {
+					var4.field607 = false;
+					var4.method1189(var6, var7, Players.field1220[var1]);
+				}
+
+			} else if (var3 == 2) {
+				var5 = var0.readBits(4);
+				var6 = var4.pathX[0];
+				var7 = var4.pathY[0];
+				if (var5 == 0) {
+					var6 -= 2;
+					var7 -= 2;
+				} else if (var5 == 1) {
+					--var6;
+					var7 -= 2;
+				} else if (var5 == 2) {
+					var7 -= 2;
+				} else if (var5 == 3) {
+					++var6;
+					var7 -= 2;
+				} else if (var5 == 4) {
+					var6 += 2;
+					var7 -= 2;
+				} else if (var5 == 5) {
+					var6 -= 2;
+					--var7;
+				} else if (var5 == 6) {
+					var6 += 2;
+					--var7;
+				} else if (var5 == 7) {
+					var6 -= 2;
+				} else if (var5 == 8) {
+					var6 += 2;
+				} else if (var5 == 9) {
+					var6 -= 2;
+					++var7;
+				} else if (var5 == 10) {
+					var6 += 2;
+					++var7;
+				} else if (var5 == 11) {
+					var6 -= 2;
+					var7 += 2;
+				} else if (var5 == 12) {
+					--var6;
+					var7 += 2;
+				} else if (var5 == 13) {
+					var7 += 2;
+				} else if (var5 == 14) {
+					++var6;
+					var7 += 2;
+				} else if (var5 == 15) {
+					var6 += 2;
+					var7 += 2;
+				}
+
+				if (Client.localPlayerIndex == var1 && (var4.x * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) {
+					var4.resetPath(var6, var7);
+					var4.field607 = false;
+				} else if (var2) {
+					var4.field607 = true;
+					var4.tileX = var6;
+					var4.tileY = var7;
+				} else {
+					var4.field607 = false;
+					var4.method1189(var6, var7, Players.field1220[var1]);
+				}
+
+			} else {
+				var5 = var0.readBits(1);
+				int var8;
+				int var9;
+				int var10;
+				int var11;
+				if (var5 == 0) {
+					var6 = var0.readBits(12);
+					var7 = var6 >> 10;
+					var8 = var6 >> 5 & 31;
+					if (var8 > 15) {
+						var8 -= 32;
+					}
+
+					var9 = var6 & 31;
+					if (var9 > 15) {
+						var9 -= 32;
+					}
+
+					var10 = var8 + var4.pathX[0];
+					var11 = var9 + var4.pathY[0];
+					if (Client.localPlayerIndex == var1 && (var4.x * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) {
+						var4.resetPath(var10, var11);
+						var4.field607 = false;
+					} else if (var2) {
+						var4.field607 = true;
+						var4.tileX = var10;
+						var4.tileY = var11;
+					} else {
+						var4.field607 = false;
+						var4.method1189(var10, var11, Players.field1220[var1]);
+					}
+
+					var4.plane = (byte)(var7 + var4.plane & 3);
+					if (Client.localPlayerIndex == var1) {
+						MouseRecorder.plane = var4.plane;
+					}
+
+				} else {
+					var6 = var0.readBits(30);
+					var7 = var6 >> 28;
+					var8 = var6 >> 14 & 16383;
+					var9 = var6 & 16383;
+					var10 = (class4.baseX * 64 + var8 + var4.pathX[0] & 16383) - class4.baseX * 64;
+					var11 = (var9 + ScriptEvent.baseY + var4.pathY[0] & 16383) - ScriptEvent.baseY;
+					if (Client.localPlayerIndex != var1 || var4.x * -78439701 >= 1536 && var4.y >= 1536 && var4.x * -78439701 < 11776 && var4.y < 11776) {
+						if (var2) {
+							var4.field607 = true;
+							var4.tileX = var10;
+							var4.tileY = var11;
+						} else {
+							var4.field607 = false;
+							var4.method1189(var10, var11, Players.field1220[var1]);
+						}
+					} else {
+						var4.resetPath(var10, var11);
+						var4.field607 = false;
+					}
+
+					var4.plane = (byte)(var7 + var4.plane & 3);
+					if (Client.localPlayerIndex == var1) {
+						MouseRecorder.plane = var4.plane;
+					}
+
+				}
 			}
 		}
 	}

-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "114"
+		signature = "(I)Z",
+		garbageValue = "-1052068547"
 	)
-	@Export("NpcDefinition_clearCached")
-	public static void NpcDefinition_clearCached() {
-		NPCDefinition.NpcDefinition_cached.clear();
-		NPCDefinition.NpcDefinition_cachedModels.clear();
+	static final boolean method1099() {
+		return ViewportMouse.ViewportMouse_isInViewport;
 	}

-	@ObfuscatedName("gh")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(III)I",
-		garbageValue = "1464962568"
+		signature = "(ILcu;ZB)I",
+		garbageValue = "1"
 	)
-	static int method1100(int var0, int var1) {
-		int var2 = var1 - 334;
-		if (var2 < 0) {
-			var2 = 0;
-		} else if (var2 > 100) {
-			var2 = 100;
+	static int method1096(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]);
+		} else {
+			var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
 		}

-		int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight;
-		return var0 * var3 / 256;
+		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
+			if (Interpreter.field1066 >= 10) {
+				throw new RuntimeException();
+			} else if (var3.onResize == null) {
+				return 0;
+			} else {
+				ScriptEvent var4 = new ScriptEvent();
+				var4.widget = var3;
+				var4.args = var3.onResize;
+				var4.field550 = Interpreter.field1066 + 1;
+				Client.scriptEvents.addFirst(var4);
+				return 1;
+			}
+		} else {
+			return 2;
+		}
 	}
 }
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -4,37 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("cw")
+@ObfuscatedName("cl")
@Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lcw;"
+		signature = "Lcl;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lcw;"
+		signature = "Lcl;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lcw;"
+		signature = "Lcl;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lcw;"
+		signature = "Lcl;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -2103853983
+		intValue = 1962411245
 	)
 	@Export("id")
 	final int id;
@@ -43,13 +43,121 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-32"
+		signature = "(I)I",
+		garbageValue = "-1410702910"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "([BI)Lcu;",
+		garbageValue = "447128018"
+	)
+	@Export("newScript")
+	static Script newScript(byte[] var0) {
+		Script var1 = new Script();
+		Buffer var2 = new Buffer(var0);
+		var2.offset = var2.array.length - 2;
+		int var3 = var2.readUnsignedShort();
+		int var4 = var2.array.length - 2 - var3 - 12;
+		var2.offset = var4;
+		int var5 = var2.readInt();
+		var1.localIntCount = var2.readUnsignedShort();
+		var1.localStringCount = var2.readUnsignedShort();
+		var1.intArgumentCount = var2.readUnsignedShort();
+		var1.stringArgumentCount = var2.readUnsignedShort();
+		int var6 = var2.readUnsignedByte();
+		int var7;
+		int var8;
+		if (var6 > 0) {
+			var1.switches = var1.newIterableNodeHashTable(var6);
+
+			for (var7 = 0; var7 < var6; ++var7) {
+				var8 = var2.readUnsignedShort();
+				int var9;
+				int var11;
+				if (var8 > 0) {
+					var11 = var8 - 1;
+					var11 |= var11 >>> 1;
+					var11 |= var11 >>> 2;
+					var11 |= var11 >>> 4;
+					var11 |= var11 >>> 8;
+					var11 |= var11 >>> 16;
+					int var10 = var11 + 1;
+					var9 = var10;
+				} else {
+					var9 = 1;
+				}
+
+				IterableNodeHashTable var13 = new IterableNodeHashTable(var9);
+				var1.switches[var7] = var13;
+
+				while (var8-- > 0) {
+					var11 = var2.readInt();
+					int var12 = var2.readInt();
+					var13.put(new IntegerNode(var12), (long)var11);
+				}
+			}
+		}
+
+		var2.offset = 0;
+		var2.readStringCp1252NullTerminatedOrNull();
+		var1.opcodes = new int[var5];
+		var1.intOperands = new int[var5];
+		var1.stringOperands = new String[var5];
+
+		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) {
+			var8 = var2.readUnsignedShort();
+			if (var8 == 3) {
+				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+				var1.intOperands[var7] = var2.readInt();
+			} else {
+				var1.intOperands[var7] = var2.readUnsignedByte();
+			}
+		}
+
+		return var1;
+	}
+
+	@ObfuscatedName("gg")
+	@ObfuscatedSignature(
+		signature = "(Lbe;IB)V",
+		garbageValue = "8"
+	)
+	@Export("getActorScreenLocation")
+	static final void getActorScreenLocation(Actor var0, int var1) {
+		NPC.worldToScreen(var0.x * -78439701, var0.y, var1);
+	}
+
+	@ObfuscatedName("jb")
+	@ObfuscatedSignature(
+		signature = "(IIIILli;Lhi;I)V",
+		garbageValue = "-1905138972"
+	)
+	@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 = var3 * var8 + var9 * var2 >> 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;
+			FontName.redHintArrowSprite.method6104(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
+		} else {
+			ChatChannel.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
+		}
+
+	}
 }
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -3,154 +3,154 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("dp")
+@ObfuscatedName("dl")
@Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("n")
-	static float[][] field1475;
-	@ObfuscatedName("t")
+	@ObfuscatedName("u")
+	static float[][] field1447;
+	@ObfuscatedName("j")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("q")
-	static float field1468;
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
+	static float field1454;
+	@ObfuscatedName("d")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("i")
-	int[][][] field1467;
-	@ObfuscatedName("k")
-	int[][][] field1470;
-	@ObfuscatedName("u")
-	int[] field1469;
+	@ObfuscatedName("t")
+	int[][][] field1458;
+	@ObfuscatedName("g")
+	int[][][] field1450;
+	@ObfuscatedName("l")
+	int[] field1451;

 	static {
-		field1475 = new float[2][8];
+		field1447 = new float[2][8];
 		coefficients = new int[2][8];
 	}

 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field1467 = new int[2][2][4];
-		this.field1470 = new int[2][2][4];
-		this.field1469 = new int[2];
+		this.field1458 = new int[2][2][4];
+		this.field1450 = new int[2][2][4];
+		this.field1451 = new int[2];
 	}

-	@ObfuscatedName("s")
-	float method2622(int var1, int var2, float var3) {
-		float var4 = (float)this.field1470[var1][0][var2] + var3 * (float)(this.field1470[var1][1][var2] - this.field1470[var1][0][var2]);
+	@ObfuscatedName("c")
+	float method2655(int var1, int var2, float var3) {
+		float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}

-	@ObfuscatedName("i")
-	float method2629(int var1, int var2, float var3) {
-		float var4 = (float)this.field1467[var1][0][var2] + var3 * (float)(this.field1467[var1][1][var2] - this.field1467[var1][0][var2]);
+	@ObfuscatedName("t")
+	float method2657(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]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2;
+			var3 = (float)this.field1451[0] + (float)(this.field1451[1] - this.field1451[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1468 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1468 * 65536.0F);
+			field1454 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			forwardMultiplier = (int)(field1454 * 65536.0F);
 		}

 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method2622(var1, 0, var2);
-			field1475[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, 0, var2));
-			field1475[var1][1] = var3 * var3;
+			var3 = this.method2655(var1, 0, var2);
+			field1447[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2657(var1, 0, var2));
+			field1447[var1][1] = var3 * var3;

 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method2622(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, var4, var2));
+				var3 = this.method2655(var1, var4, var2);
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2657(var1, var4, var2));
 				float var6 = var3 * var3;
-				field1475[var1][var4 * 2 + 1] = field1475[var1][var4 * 2 - 1] * var6;
-				field1475[var1][var4 * 2] = field1475[var1][var4 * 2 - 1] * var5 + field1475[var1][var4 * 2 - 2] * var6;
+				field1447[var1][var4 * 2 + 1] = field1447[var1][var4 * 2 - 1] * var6;
+				field1447[var1][var4 * 2] = field1447[var1][var4 * 2 - 1] * var5 + field1447[var1][var4 * 2 - 2] * var6;

 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field1475[var1];
-					var10000[var7] += field1475[var1][var7 - 1] * var5 + field1475[var1][var7 - 2] * var6;
+					var10000 = field1447[var1];
+					var10000[var7] += field1447[var1][var7 - 1] * var5 + field1447[var1][var7 - 2] * var6;
 				}

-				var10000 = field1475[var1];
-				var10000[1] += field1475[var1][0] * var5 + var6;
-				var10000 = field1475[var1];
+				var10000 = field1447[var1];
+				var10000[1] += field1447[var1][0] * var5 + var6;
+				var10000 = field1447[var1];
 				var10000[0] += var5;
 			}

 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field1475[0];
-					var10000[var4] *= field1468;
+					var10000 = field1447[0];
+					var10000[var4] *= field1454;
 				}
 			}

 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field1475[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1447[var1][var4] * 65536.0F);
 			}

 			return this.pairs[var1] * 2;
 		}
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Lky;Ldv;)V"
+		signature = "(Lkz;Ldo;)V"
 	)
-	final void method2637(Buffer var1, SoundEnvelope var2) {
+	final void method2666(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field1469[0] = var1.readUnsignedShort();
-			this.field1469[1] = var1.readUnsignedShort();
+			this.field1451[0] = var1.readUnsignedShort();
+			this.field1451[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.field1467[var5][0][var6] = var1.readUnsignedShort();
-					this.field1470[var5][0][var6] = var1.readUnsignedShort();
+					this.field1458[var5][0][var6] = var1.readUnsignedShort();
+					this.field1450[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.field1467[var5][1][var6] = var1.readUnsignedShort();
-						this.field1470[var5][1][var6] = var1.readUnsignedShort();
+						this.field1458[var5][1][var6] = var1.readUnsignedShort();
+						this.field1450[var5][1][var6] = var1.readUnsignedShort();
 					} else {
-						this.field1467[var5][1][var6] = this.field1467[var5][0][var6];
-						this.field1470[var5][1][var6] = this.field1470[var5][0][var6];
+						this.field1458[var5][1][var6] = this.field1458[var5][0][var6];
+						this.field1450[var5][1][var6] = this.field1450[var5][0][var6];
 					}
 				}
 			}

-			if (var4 != 0 || this.field1469[1] != this.field1469[0]) {
+			if (var4 != 0 || this.field1451[1] != this.field1451[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var7 = this.field1469;
-			this.field1469[1] = 0;
+			int[] var7 = this.field1451;
+			this.field1451[1] = 0;
 			var7[0] = 0;
 		}

 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);
--- a/runescape-client/src/main/java/BZip2Decompressor.java
+++ b/runescape-client/src/main/java/BZip2Decompressor.java
@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ku")
+@ObfuscatedName("kw")
@Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lkw;"
+		signature = "Lki;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@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.field3721 = 0;
+			BZip2Decompressor_state.field3740 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lkw;)V"
+		signature = "(Lki;)V"
 	)
-	static void method5667(BZip2State var0) {
+	static void method5753(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = Coord.BZip2Decompressor_block;
-		int var7 = var0.field3736;
+		int[] var6 = VarbitDefinition.BZip2Decompressor_block;
+		int var7 = var0.field3725;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3754 + 1;
+		int var12 = var0.field3710 + 1;

 		label61:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}

-		int var13 = var0.field3721;
-		var0.field3721 += var10 - var10;
-		if (var0.field3721 < var13) {
+		int var13 = var0.field3740;
+		var0.field3740 += var10 - var10;
+		if (var0.field3740 < var13) {
 		}

 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		Coord.BZip2Decompressor_block = var6;
-		var0.field3736 = var7;
+		VarbitDefinition.BZip2Decompressor_block = var6;
+		var0.field3725 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkw;)V"
+		signature = "(Lki;)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 (Coord.BZip2Decompressor_block == null) {
-			Coord.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
+		if (VarbitDefinition.BZip2Decompressor_block == null) {
+			VarbitDefinition.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]++;
-							Coord.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							VarbitDefinition.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) {
-								Coord.BZip2Decompressor_block[var47] = var1 & 255;
+								VarbitDefinition.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}

 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(Coord.BZip2Decompressor_block[var36] & 255);
-						var10000 = Coord.BZip2Decompressor_block;
+						var1 = (byte)(VarbitDefinition.BZip2Decompressor_block[var36] & 255);
+						var10000 = VarbitDefinition.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}

-					var0.field3736 = Coord.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3725 = VarbitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3736 = Coord.BZip2Decompressor_block[var0.field3736];
-					var0.su_ch2 = (byte)(var0.field3736 & 255);
-					var0.field3736 >>= 8;
+					var0.field3725 = VarbitDefinition.BZip2Decompressor_block[var0.field3725];
+					var0.su_ch2 = (byte)(var0.field3725 & 255);
+					var0.field3725 >>= 8;
 					++var0.nblocks_used;
-					var0.field3754 = var47;
-					method5667(var0);
-					if (var0.field3754 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					var0.field3710 = var47;
+					method5753(var0);
+					if (var0.field3710 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Lkw;)B"
+		signature = "(Lki;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Lkw;)B"
+		signature = "(Lki;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(ILkw;)I"
+		signature = "(ILki;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkw;)V"
+		signature = "(Lki;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {

 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("BZip2Decompressor_createHuffmanTables")
 	static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) {
 		int var7 = 0;
--- a/runescape-client/src/main/java/BZip2State.java
+++ b/runescape-client/src/main/java/BZip2State.java
@@ -2,169 +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("kw")
+@ObfuscatedName("ki")
@Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("s")
-	final int field3737;
-	@ObfuscatedName("j")
-	final int field3745;
-	@ObfuscatedName("i")
-	final int field3746;
-	@ObfuscatedName("k")
-	final int field3722;
-	@ObfuscatedName("u")
-	final int field3735;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	final int field3717;
+	@ObfuscatedName("x")
+	final int field3709;
 	@ObfuscatedName("t")
+	final int field3715;
+	@ObfuscatedName("g")
+	final int field3712;
+	@ObfuscatedName("l")
+	final int field3737;
+	@ObfuscatedName("u")
+	final int field3731;
+	@ObfuscatedName("j")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1249128023
+		intValue = 1785442725
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -423174679
+		intValue = 1327133653
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1450954735
+		intValue = 1502043783
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 875649401
+		intValue = 1076780583
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1562015159
+		intValue = -2062863895
 	)
-	int field3721;
-	@ObfuscatedName("y")
+	int field3740;
+	@ObfuscatedName("s")
 	@Export("out_char")
 	byte out_char;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1013295897
+		intValue = -424992051
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("b")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 2065373853
+		intValue = 2124513987
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -322433333
+		intValue = 225690987
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1084513280
+		intValue = 813800448
 	)
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1304598549
+		intValue = 1074633139
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("a")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 293823581
+		intValue = 1279441131
 	)
-	int field3736;
-	@ObfuscatedName("w")
+	int field3725;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -545729875
+		intValue = 1234783121
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("h")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1751111105
+		intValue = -147337203
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("o")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 463275141
+		intValue = 1493034079
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("av")
+	@ObfuscatedName("ag")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("am")
+	@ObfuscatedName("at")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ao")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("af")
+	@ObfuscatedName("av")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("an")
+	@ObfuscatedName("as")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ad")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ap")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ax")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aj")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ab")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -716853171
+		intValue = -864562359
 	)
-	int field3754;
+	int field3710;

 	BZip2State() {
-		this.field3737 = 4096;
-		this.field3745 = 16;
-		this.field3746 = 258;
-		this.field3722 = 6;
-		this.field3735 = 50;
-		this.field3717 = 18002;
+		this.field3717 = 4096;
+		this.field3709 = 16;
+		this.field3715 = 258;
+		this.field3712 = 6;
+		this.field3737 = 50;
+		this.field3731 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -182,13 +181,4 @@ public final class BZip2State {
 		this.perm = new int[6][258];
 		this.minLens = new int[6];
 	}
-
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "-3321312"
-	)
-	static int method5664(int var0) {
-		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F));
-	}
 }
--- a/runescape-client/src/main/java/BoundaryObject.java
+++ b/runescape-client/src/main/java/BoundaryObject.java
@@ -4,66 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ey")
+@ObfuscatedName("ea")
@Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("d")
+	@ObfuscatedName("ok")
 	@ObfuscatedSignature(
-		signature = "[Llq;"
+		signature = "Lcj;"
 	)
-	@Export("title_muteSprite")
-	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("s")
+	@Export("varcs")
+	static Varcs varcs;
+	@ObfuscatedName("sm")
+	@Export("foundItemIds")
+	static short[] foundItemIds;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -557020941
+		intValue = -2123632967
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -308845337
-	)
-	@Export("x")
-	int x;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -808193817
+		intValue = 1852557733
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1993098605
+		intValue = 728809035
+	)
+	@Export("x")
+	int x;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 848853075
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1270638241
+		intValue = -1849497569
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Len;"
+		signature = "Lel;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Len;"
+		signature = "Lel;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = 1081854748204039869L
+		longValue = -720242261539970297L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1627431525
+		intValue = -1272619537
 	)
 	@Export("flags")
 	int flags;
@@ -73,252 +76,16 @@ public final class BoundaryObject {
 		this.flags = 0;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;ZII)V",
-		garbageValue = "1558921351"
+		signature = "(IB)Ljava/lang/String;",
+		garbageValue = "-17"
 	)
-	static void method3213(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-		if (Login.field1146) {
-			if (var3 == 4) {
-				Login.loginIndex = 4;
-			}
-
+	static final String method3230(int var0) {
+		if (var0 < 100000) {
+			return "<col=ffff00>" + var0 + "</col>";
 		} else {
-			Login.loginIndex = var3;
-			Rasterizer2D.Rasterizer2D_clear();
-			byte[] var4 = var0.takeFileByNames("title.jpg", "");
-			Login.leftTitleSprite = WorldMapIcon_0.convertJpgToSprite(var4);
-			Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally();
-			if ((Client.worldProperties & 536870912) != 0) {
-				class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
-			} else {
-				class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
-			}
-
-			Login.titleboxSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
-			Login.titlebuttonSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
-			int var6 = var1.getGroupId("runes");
-			int var7 = var1.getFileId(var6, "");
-			IndexedSprite[] var8;
-			if (!World.SpriteBuffer_bufferFile(var1, var6, var7)) {
-				var8 = null;
-			} else {
-				IndexedSprite[] var10 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
-
-				for (int var11 = 0; var11 < class325.SpriteBuffer_spriteCount; ++var11) {
-					IndexedSprite var12 = var10[var11] = new IndexedSprite();
-					var12.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
-					var12.height = class325.SpriteBuffer_spriteHeight;
-					var12.xOffset = class325.SpriteBuffer_xOffsets[var11];
-					var12.yOffset = class325.SpriteBuffer_yOffsets[var11];
-					var12.subWidth = class325.SpriteBuffer_spriteWidths[var11];
-					var12.subHeight = class225.SpriteBuffer_spriteHeights[var11];
-					var12.palette = class325.SpriteBuffer_spritePalette;
-					var12.pixels = WorldMapSection1.SpriteBuffer_pixels[var11];
-				}
-
-				UserComparator7.SpriteBuffer_clear();
-				var8 = var10;
-			}
-
-			ItemDefinition.runesSprite = var8;
-			var7 = var1.getGroupId("title_mute");
-			int var14 = var1.getFileId(var7, "");
-			IndexedSprite[] var9;
-			if (!World.SpriteBuffer_bufferFile(var1, var7, var14)) {
-				var9 = null;
-			} else {
-				IndexedSprite[] var18 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
-
-				for (int var19 = 0; var19 < class325.SpriteBuffer_spriteCount; ++var19) {
-					IndexedSprite var13 = var18[var19] = new IndexedSprite();
-					var13.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
-					var13.height = class325.SpriteBuffer_spriteHeight;
-					var13.xOffset = class325.SpriteBuffer_xOffsets[var19];
-					var13.yOffset = class325.SpriteBuffer_yOffsets[var19];
-					var13.subWidth = class325.SpriteBuffer_spriteWidths[var19];
-					var13.subHeight = class225.SpriteBuffer_spriteHeights[var19];
-					var13.palette = class325.SpriteBuffer_spritePalette;
-					var13.pixels = WorldMapSection1.SpriteBuffer_pixels[var19];
-				}
-
-				UserComparator7.SpriteBuffer_clear();
-				var9 = var18;
-			}
-
-			title_muteSprite = var9;
-			Login.options_buttons_0Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
-			class83.field1136 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
-			Login.options_buttons_2Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
-			class96.field1303 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
-			UserComparator8.field1957 = Login.options_buttons_0Sprite.subWidth;
-			class173.field2079 = Login.options_buttons_0Sprite.subHeight;
-			Bounds.loginScreenRunesAnimation = new LoginScreenAnimation(ItemDefinition.runesSprite);
-			if (var2) {
-				Login.Login_username = "";
-				Login.Login_password = "";
-			}
-
-			SecureRandomCallable.field500 = 0;
-			WorldMapSection1.otp = "";
-			Login.field1171 = true;
-			Login.worldSelectOpen = false;
-			if (!GrandExchangeOffer.clientPreferences.titleMusicDisabled) {
-				Archive var16 = GrandExchangeEvent.archive6;
-				var14 = var16.getGroupId("scape main");
-				int var17 = var16.getFileId(var14, "");
-				Projectile.method2040(2, var16, var14, var17, 255, false);
-			} else {
-				DevicePcmPlayerProvider.method793(2);
-			}
-
-			NPC.method1977(false);
-			Login.field1146 = true;
-			Login.xPadding = (KitDefinition.canvasWidth - 765) / 2;
-			Login.loginBoxX = Login.xPadding + 202;
-			Login.loginBoxCenter = Login.loginBoxX + 180;
-			Login.leftTitleSprite.drawAt(Login.xPadding, 0);
-			Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
-			class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18);
+			return var0 < 10000000 ? "<col=ffffff>" + var0 / 1000 + "K" + "</col>" : "<col=00ff80>" + var0 / 1000000 + "M" + "</col>";
 		}
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "1412728541"
-	)
-	@Export("Messages_getHistorySize")
-	static int Messages_getHistorySize(int var0) {
-		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0);
-		return var1 == null ? 0 : var1.size();
-	}
-
-	@ObfuscatedName("t")
-	@Export("Entity_unpackID")
-	public static int Entity_unpackID(long var0) {
-		return (int)(var0 >>> 17 & 4294967295L);
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(IIIB)I",
-		garbageValue = "64"
-	)
-	@Export("hslToRgb")
-	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;
-	}
-
-	@ObfuscatedName("hk")
-	@ObfuscatedSignature(
-		signature = "(ZLkx;B)V",
-		garbageValue = "-77"
-	)
-	static final void method3216(boolean var0, PacketBuffer var1) {
-		while (true) {
-			if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
-				int var2 = var1.readBits(15);
-				if (var2 != 32767) {
-					boolean var3 = false;
-					if (Client.npcs[var2] == null) {
-						Client.npcs[var2] = new NPC();
-						var3 = true;
-					}
-
-					NPC var4 = Client.npcs[var2];
-					Client.npcIndices[++Client.npcCount - 1] = var2;
-					var4.npcCycle = Client.cycle;
-					int var5;
-					if (var0) {
-						var5 = var1.readBits(8);
-						if (var5 > 127) {
-							var5 -= 256;
-						}
-					} else {
-						var5 = var1.readBits(5);
-						if (var5 > 15) {
-							var5 -= 32;
-						}
-					}
-
-					int var6 = var1.readBits(1);
-					int var7 = Client.defaultRotations[var1.readBits(3)];
-					if (var3) {
-						var4.orientation = var4.rotation = var7;
-					}
-
-					int var8 = var1.readBits(1);
-					if (var8 == 1) {
-						Client.field669[++Client.field861 - 1] = var2;
-					}
-
-					int var9;
-					if (var0) {
-						var9 = var1.readBits(8);
-						if (var9 > 127) {
-							var9 -= 256;
-						}
-					} else {
-						var9 = var1.readBits(5);
-						if (var9 > 15) {
-							var9 -= 32;
-						}
-					}
-
-					var4.definition = ViewportMouse.getNpcDefinition(var1.readBits(14));
-					var4.size = var4.definition.size * 64;
-					var4.field971 = var4.definition.rotation;
-					if (var4.field971 == 0) {
-						var4.rotation = 0;
-					}
-
-					var4.walkSequence = var4.definition.walkSequence;
-					var4.walkBackSequence = var4.definition.walkBackSequence;
-					var4.walkLeftSequence = var4.definition.walkLeftSequence;
-					var4.walkRightSequence = var4.definition.walkRightSequence;
-					var4.readySequence = var4.definition.readySequence;
-					var4.turnLeftSequence = var4.definition.turnLeftSequence;
-					var4.turnRightSequence = var4.definition.turnRightSequence;
-					var4.method1970(WorldMapIcon_1.localPlayer.pathX[0] + var5, WorldMapIcon_1.localPlayer.pathY[0] + var9, var6 == 1);
-					continue;
-				}
-			}
-
-			var1.exportIndex();
-			return;
-		}
-	}
-
-	@ObfuscatedName("ka")
-	@ObfuscatedSignature(
-		signature = "(IIIZI)V",
-		garbageValue = "-1395440174"
-	)
-	public static void method3215(int var0, int var1, int var2, boolean var3) {
-		PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher);
-		var4.packetBuffer.writeIntME(var3 ? Client.field705 : 0);
-		var4.packetBuffer.writeShortLE(var1);
-		var4.packetBuffer.method5545(var2);
-		var4.packetBuffer.writeShort(var0);
-		Client.packetWriter.addNode(var4);
-	}
 }
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -4,41 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("lh")
+@ObfuscatedName("lr")
@Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "Lbt;"
-	)
-	@Export("loginScreenRunesAnimation")
-	static LoginScreenAnimation loginScreenRunesAnimation;
-	@ObfuscatedName("fv")
-	@ObfuscatedSignature(
-		signature = "Lkg;"
-	)
-	static AbstractSocket field3845;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 927119221
+		intValue = -242928427
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1883471895
+		intValue = -1412221703
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 482662949
+		intValue = -1383178295
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1342895921
+		intValue = -647845267
 	)
 	@Export("highY")
 	public int highY;
@@ -52,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
-		garbageValue = "-92"
+		signature = "(IIS)V",
+		garbageValue = "23378"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -63,10 +52,10 @@ public class Bounds {
 		this.lowY = var2;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "638104028"
+		garbageValue = "-361054840"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -74,22 +63,22 @@ public class Bounds {
 		this.highY = var2;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Llh;Llh;B)V",
-		garbageValue = "15"
+		signature = "(Llr;Llr;S)V",
+		garbageValue = "3042"
 	)
-	public void method5846(Bounds var1, Bounds var2) {
-		this.method5867(var1, var2);
-		this.method5848(var1, var2);
+	public void method5948(Bounds var1, Bounds var2) {
+		this.method5936(var1, var2);
+		this.method5938(var1, var2);
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Llh;Llh;I)V",
-		garbageValue = "-157171607"
+		signature = "(Llr;Llr;I)V",
+		garbageValue = "1943311297"
 	)
-	void method5867(Bounds var1, Bounds var2) {
+	void method5936(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
@@ -97,8 +86,8 @@ public class Bounds {
 			var2.lowX = var1.lowX;
 		}

-		if (var2.method5847() > var1.method5847()) {
-			var2.highX -= var2.method5847() - var1.method5847();
+		if (var2.method5947() > var1.method5947()) {
+			var2.highX -= var2.method5947() - var1.method5947();
 		}

 		if (var2.highX < 0) {
@@ -107,12 +96,12 @@ public class Bounds {

 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Llh;Llh;I)V",
-		garbageValue = "-2140694621"
+		signature = "(Llr;Llr;B)V",
+		garbageValue = "0"
 	)
-	void method5848(Bounds var1, Bounds var2) {
+	void method5938(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
@@ -120,8 +109,8 @@ public class Bounds {
 			var2.lowY = var1.lowY;
 		}

-		if (var2.method5842() > var1.method5842()) {
-			var2.highY -= var2.method5842() - var1.method5842();
+		if (var2.method5940() > var1.method5940()) {
+			var2.highY -= var2.method5940() - var1.method5940();
 		}

 		if (var2.highY < 0) {
@@ -130,47 +119,37 @@ public class Bounds {

 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "134601683"
+		garbageValue = "-241231712"
 	)
-	int method5847() {
+	int method5947() {
 		return this.highX + this.lowX;
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-901412341"
+		garbageValue = "-1659278045"
 	)
-	int method5842() {
+	int method5940() {
 		return this.highY + this.lowY;
 	}

-	public String abb() {
-		return null;
-	}
-
-	public String abd() {
-		return null;
-	}
-
 	public String toString() {
 		return null;
 	}

-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(I)Lfs;",
-		garbageValue = "-2037238373"
-	)
-	@Export("newClock")
-	public static Clock newClock() {
-		try {
-			return new NanoClock();
-		} catch (Throwable var1) {
-			return new MilliClock();
-		}
+	public String aan() {
+		return null;
+	}
+
+	public String aai() {
+		return null;
+	}
+
+	public String aar() {
+		return null;
 	}
 }
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -4,27 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jt")
+@ObfuscatedName("je")
@Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("c")
-	@Export("Tiles_lightness")
-	static int[] Tiles_lightness;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 453016847
+		intValue = -359902741
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1487463363
+		intValue = 725247471
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -838100941
+		intValue = -846387241
 	)
 	@Export("rank")
 	public int rank;
@@ -33,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}

-	@ObfuscatedName("aq")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-1748427179"
+		garbageValue = "-741499831"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -44,33 +41,23 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}

-	@ObfuscatedName("ay")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1469335924"
+		garbageValue = "293368620"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}

-	@ObfuscatedName("ad")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-1595892037"
+		signature = "(S)Z",
+		garbageValue = "-12107"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
-
-	@ObfuscatedName("bk")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "1544989297"
-	)
-	@Export("stringCp1252NullTerminatedByteSize")
-	public static int stringCp1252NullTerminatedByteSize(String var0) {
-		return var0.length() + 1;
-	}
 }
--- a/runescape-client/src/main/java/BuddyRankComparator.java
+++ b/runescape-client/src/main/java/BuddyRankComparator.java
@@ -1,12 +1,19 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("fi")
+@ObfuscatedName("fh")
@Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("s")
+	@ObfuscatedName("my")
+	@ObfuscatedGetter(
+		intValue = 30724641
+	)
+	@Export("selectedSpellFlags")
+	static int selectedSpellFlags;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;

@@ -14,10 +21,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljt;Ljt;I)I",
-		garbageValue = "1327154519"
+		signature = "(Lje;Lje;S)I",
+		garbageValue = "28982"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -31,139 +38,4 @@ public class BuddyRankComparator extends AbstractUserComparator {
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(ILkv;Lid;I)V",
-		garbageValue = "1244891024"
-	)
-	static void method3376(int var0, ArchiveDisk var1, Archive var2) {
-		ArchiveDiskAction var3 = new ArchiveDiskAction();
-		var3.type = 1;
-		var3.key = (long)var0;
-		var3.archiveDisk = var1;
-		var3.archive = var2;
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
-		}
-
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-			if (ArchiveDiskActionHandler.field3124 == 0) {
-				class13.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-				class13.ArchiveDiskActionHandler_thread.setDaemon(true);
-				class13.ArchiveDiskActionHandler_thread.start();
-				class13.ArchiveDiskActionHandler_thread.setPriority(5);
-			}
-
-			ArchiveDiskActionHandler.field3124 = 600;
-		}
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(Lid;IIIBZI)V",
-		garbageValue = "-800902094"
-	)
-	@Export("requestNetFile")
-	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
-		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("fs")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "124595109"
-	)
-	@Export("doCheat")
-	static final void doCheat(String var0) {
-		if (var0.equalsIgnoreCase("toggleroof")) {
-			GrandExchangeOffer.clientPreferences.roofsHidden = !GrandExchangeOffer.clientPreferences.roofsHidden;
-			GrandExchangeOfferAgeComparator.savePreferences();
-			if (GrandExchangeOffer.clientPreferences.roofsHidden) {
-				DirectByteArrayCopier.addGameMessage(99, "", "Roofs are now all hidden");
-			} else {
-				DirectByteArrayCopier.addGameMessage(99, "", "Roofs will only be removed selectively");
-			}
-		}
-
-		if (var0.equalsIgnoreCase("displayfps")) {
-			Client.displayFps = !Client.displayFps;
-		}
-
-		if (var0.equalsIgnoreCase("renderself")) {
-			Client.renderSelf = !Client.renderSelf;
-		}
-
-		if (var0.equalsIgnoreCase("mouseovertext")) {
-			Client.showMouseOverText = !Client.showMouseOverText;
-		}
-
-		if (Client.staffModLevel >= 2) {
-			if (var0.equalsIgnoreCase("errortest")) {
-				throw new RuntimeException();
-			}
-
-			if (var0.equalsIgnoreCase("showcoord")) {
-				WorldMapCacheName.worldMap.showCoord = !WorldMapCacheName.worldMap.showCoord;
-			}
-
-			if (var0.equalsIgnoreCase("fpson")) {
-				Client.displayFps = true;
-			}
-
-			if (var0.equalsIgnoreCase("fpsoff")) {
-				Client.displayFps = false;
-			}
-
-			if (var0.equalsIgnoreCase("gc")) {
-				System.gc();
-			}
-
-			if (var0.equalsIgnoreCase("clientdrop")) {
-				class2.method31();
-			}
-		}
-
-		PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
-		var1.packetBuffer.writeByte(var0.length() + 1);
-		var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-		Client.packetWriter.addNode(var1);
-	}
 }
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -9,69 +9,69 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("mw")
@Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lmm;"
+		signature = "Lmr;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		longValue = 6930797311862622501L
+		longValue = 3832537233495769245L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 324861765
+		intValue = 327772987
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = 2678508088338929319L
+		longValue = -7089347366618851565L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1286336757
+		intValue = 1970592505
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = -1907180336926601455L
+		longValue = -5326533979176937991L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		longValue = 4723760243484879195L
+		longValue = -2696097310497379977L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = 2095185296289778233L
+		longValue = 7888031407881302655L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		longValue = -4232607220009999679L
+		longValue = -3322791226298163907L
 	)
 	@Export("fileOffset")
 	long fileOffset;

 	@ObfuscatedSignature(
-		signature = "(Lmm;II)V"
+		signature = "(Lmr;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L;
@@ -84,10 +84,10 @@ public class BufferedFile {
 		this.offset = 0L;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-2018301044"
+		garbageValue = "806301306"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)J",
-		garbageValue = "54"
+		signature = "(I)J",
+		garbageValue = "-1810414752"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "-1442283725"
+		garbageValue = "318329174"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
-		garbageValue = "-481612055"
+		signature = "([BIIS)V",
+		garbageValue = "-2545"
 	)
 	@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 (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) {
+			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 < (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset));
 				if (var8 > var3) {
 					var8 = var3;
@@ -184,7 +184,7 @@ public class BufferedFile {
 				this.offset += (long)var8;
 			}

-			if (this.writeBufferOffset != -1L) {
+			if (-1L != this.writeBufferOffset) {
 				if (this.writeBufferOffset > this.offset && var3 > 0) {
 					var8 = var2 + (int)(this.writeBufferOffset - this.offset);
 					if (var8 > var3 + var2) {
@@ -200,15 +200,15 @@ public class BufferedFile {

 				long var13 = -1L;
 				long var10 = -1L;
-				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) {
+				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) {
 					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) {
-					var10 = this.writeBufferOffset + (long)this.writeBufferLength;
-				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
+				} else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
 					var10 = var4 + (long)var7;
 				}

@@ -231,15 +231,15 @@ public class BufferedFile {
 		}
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-263792175"
+		garbageValue = "1455247160"
 	)
 	@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,10 +261,10 @@ public class BufferedFile {

 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-516860317"
+		garbageValue = "-2110413759"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -273,11 +273,11 @@ public class BufferedFile {
 				this.length = (long)var3 + this.offset;
 			}

-			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
+			if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
 				this.flush();
 			}

-			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) {
+			if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) {
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset));
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4);
 				this.offset += (long)var4;
@@ -314,16 +314,16 @@ public class BufferedFile {

 				long var9 = -1L;
 				long var6 = -1L;
-				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 					var9 = this.offset;
 				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) {
 					var9 = this.readBufferOffset;
 				}

-				if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) {
-					var6 = this.offset + (long)var3;
-				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) {
-					var6 = (long)this.readBufferLength + this.readBufferOffset;
+				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) {
+					var6 = (long)var3 + this.offset;
+				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) {
+					var6 = this.readBufferOffset + (long)this.readBufferLength;
 				}

 				if (var9 > -1L && var6 > var9) {
@@ -339,21 +339,21 @@ public class BufferedFile {
 		}
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "2123212638"
+		garbageValue = "-753348835"
 	)
 	@Export("flush")
 	void flush() throws IOException {
 		if (-1L != this.writeBufferOffset) {
-			if (this.writeBufferOffset != this.fileOffset) {
+			if (this.fileOffset != this.writeBufferOffset) {
 				this.accessFile.seek(this.writeBufferOffset);
 				this.fileOffset = this.writeBufferOffset;
 			}

 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength);
-			this.fileOffset += (long)(this.writeBufferLength * 1940047011) * -1286336757L;
+			this.fileOffset += 1970592505L * (long)(this.writeBufferLength * -1633237175);
 			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 < (long)this.readBufferLength + this.readBufferOffset) {
 				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 (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) {
 				var3 = (long)this.writeBufferLength + this.writeBufferOffset;
 			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) {
-				var3 = (long)this.readBufferLength + this.readBufferOffset;
+				var3 = this.readBufferOffset + (long)this.readBufferLength;
 			}

 			if (var1 > -1L && var3 > var1) {
--- a/runescape-client/src/main/java/BufferedNetSocket.java
+++ b/runescape-client/src/main/java/BufferedNetSocket.java
@@ -5,26 +5,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ko")
+@ObfuscatedName("ka")
@Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	@Export("socket")
+	Socket socket;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lkh;"
+		signature = "Lkl;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("j")
-	@Export("socket")
-	Socket socket;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lki;"
+		signature = "Lkq;"
 	)
 	@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);
@@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-1798752769"
+		signature = "(B)V",
+		garbageValue = "-75"
 	)
 	@Export("close")
 	public void close() {
@@ -51,65 +51,61 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "547465689"
+		garbageValue = "1827163357"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "83"
+		signature = "(I)I",
+		garbageValue = "-1354053248"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "156087109"
+		garbageValue = "-377412375"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "([BIIB)I",
-		garbageValue = "100"
+		signature = "([BIII)I",
+		garbageValue = "2063129771"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
-		garbageValue = "638463675"
+		signature = "([BIIB)V",
+		garbageValue = "9"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		this.sink.write(var1, var2, var3);
 	}

-	protected void abt() {
-		this.close();
-	}
-
 	protected void finalize() {
 		this.close();
 	}

-	protected void abi() {
+	protected void aaj() {
 		this.close();
 	}
 }
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ki")
+@ObfuscatedName("kq")
@Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -2122061045
+		intValue = -416558403
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -786239105
+		intValue = -1582745375
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -225046667
+		intValue = -1128021535
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("closed")
 	boolean closed;

@@ -54,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "-52"
+		signature = "(S)Z",
+		garbageValue = "2879"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -79,10 +79,10 @@ public class BufferedSink implements Runnable {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
-		garbageValue = "22"
+		signature = "([BIII)V",
+		garbageValue = "2082682209"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -119,10 +119,10 @@ public class BufferedSink implements Runnable {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "4"
+		garbageValue = "0"
 	)
 	@Export("close")
 	void close() {
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -7,37 +7,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("kh")
+@ObfuscatedName("kl")
@Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("dr")
+	@ObfuscatedSignature(
+		signature = "Lio;"
+	)
+	@Export("archive15")
+	static Archive archive15;
+	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -219567751
+		intValue = -957972311
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 779012297
+		intValue = -499111829
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1500766173
+		intValue = -1421427639
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("exception")
 	IOException exception;

@@ -52,10 +58,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "188903163"
+		signature = "(IB)Z",
+		garbageValue = "-46"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +92,10 @@ public class BufferedSource implements Runnable {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-85"
+		signature = "(I)I",
+		garbageValue = "-266051829"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,15 +116,15 @@ public class BufferedSource implements Runnable {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1102638305"
+		garbageValue = "842069737"
 	)
 	@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 +139,10 @@ public class BufferedSource implements Runnable {
 		}
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "([BIIS)I",
-		garbageValue = "128"
+		signature = "([BIII)I",
+		garbageValue = "372085290"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +180,10 @@ public class BufferedSource implements Runnable {
 		}
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(S)V",
-		garbageValue = "6608"
+		signature = "(I)V",
+		garbageValue = "-122132580"
 	)
 	@Export("close")
 	void close() {
--- a/runescape-client/src/main/java/ByteArrayNode.java
+++ b/runescape-client/src/main/java/ByteArrayNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;

-@ObfuscatedName("fl")
+@ObfuscatedName("fg")
@Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("byteArray")
 	public byte[] byteArray;

--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -4,41 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("km")
+@ObfuscatedName("ky")
@Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -2023224885
+		intValue = 1827163357
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -770015567
+		intValue = -1136755957
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -155376471
+		intValue = 871575803
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("q")
-	@Export("ByteArrayPool_altSizeArrayCounts")
-	public static int[] ByteArrayPool_altSizeArrayCounts;
-	@ObfuscatedName("w")
-	public static String field3708;
+	@ObfuscatedName("j")
+	@Export("ByteArrayPool_alternativeSizes")
+	static int[] ByteArrayPool_alternativeSizes;

 	static {
 		ByteArrayPool_smallCount = 0;
@@ -49,10 +47,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IZB)[B",
-		garbageValue = "82"
+		signature = "(IZI)[B",
+		garbageValue = "-2146041378"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -84,14 +82,14 @@ public class ByteArrayPool {
 			return var2;
 		}

-		if (FaceNormal.ByteArrayPool_arrays != null) {
-			for (int var4 = 0; var4 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var4) {
-				if (UserComparator4.ByteArrayPool_alternativeSizes[var4] != var0) {
-					if (var0 < UserComparator4.ByteArrayPool_alternativeSizes[var4]) {
+		if (WorldMapEvent.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) {
-					byte[] var3 = FaceNormal.ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]];
-					FaceNormal.ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null;
+				} else if (Login.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+					byte[] var3 = WorldMapEvent.ByteArrayPool_arrays[var4][--Login.ByteArrayPool_altSizeArrayCounts[var4]];
+					WorldMapEvent.ByteArrayPool_arrays[var4][Login.ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}
@@ -99,4 +97,17 @@ public class ByteArrayPool {

 		return new byte[var0];
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;II)V",
+		garbageValue = "651984351"
+	)
+	static final void method5750(String var0, int var1) {
+		PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2193, Client.packetWriter.isaacCipher);
+		var2.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var0) + 1);
+		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
+		var2.packetBuffer.method5493(var1);
+		Client.packetWriter.addNode(var2);
+	}
 }
--- a/runescape-client/src/main/java/Calendar.java
+++ b/runescape-client/src/main/java/Calendar.java
@@ -4,16 +4,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("gz")
+@ObfuscatedName("gm")
@Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("DAYS_OF_THE_WEEK")
 	static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("Calendar_calendar")
 	static java.util.Calendar Calendar_calendar;

@@ -24,211 +24,22 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}

-	@ObfuscatedName("ip")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "516952450"
+		signature = "(II)Z",
+		garbageValue = "-283445433"
 	)
-	@Export("addSceneMenuOptions")
-	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
-		if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
-			WorldMapData_0.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
-		}
+	@Export("isWorldMapEvent")
+	public static boolean isWorldMapEvent(int var0) {
+		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17;
+	}

-		long var4 = -1L;
-		long var6 = -1L;
-		int var8 = 0;
-
-		while (true) {
-			int var10 = ViewportMouse.ViewportMouse_entityCount;
-			if (var8 >= var10) {
-				if (-1L != var4) {
-					var8 = (int)(var4 >>> 0 & 127L);
-					var10 = (int)(var4 >>> 7 & 127L);
-					Player var12 = Client.players[Client.combatTargetPlayerIndex];
-					class51.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10);
-				}
-
-				return;
-			}
-
-			long var27 = ViewportMouse.ViewportMouse_entityTags[var8];
-			if (var27 != var6) {
-				label319: {
-					var6 = var27;
-					int var15 = class218.ViewportMouse_unpackX(var8);
-					int var16 = GameObject.ViewportMouse_unpackY(var8);
-					int var17 = class40.method729(ViewportMouse.ViewportMouse_entityTags[var8]);
-					int var19 = BoundaryObject.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]);
-					int var20 = var19;
-					if (var17 == 2 && Player.scene.getObjectFlags(ItemContainer.plane, var15, var16, var27) >= 0) {
-						ObjectDefinition var21 = class215.getObjectDefinition(var19);
-						if (var21.transforms != null) {
-							var21 = var21.transform();
-						}
-
-						if (var21 == null) {
-							break label319;
-						}
-
-						if (Client.isItemSelected == 1) {
-							WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 1, var19, var15, var16);
-						} else if (Client.isSpellSelected) {
-							if ((WorldMapSectionType.selectedSpellFlags & 4) == 4) {
-								WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 2, var19, var15, var16);
-							}
-						} else {
-							String[] var29 = var21.actions;
-							if (var29 != null) {
-								for (int var32 = 4; var32 >= 0; --var32) {
-									if (var29[var32] != null) {
-										short var24 = 0;
-										if (var32 == 0) {
-											var24 = 3;
-										}
-
-										if (var32 == 1) {
-											var24 = 4;
-										}
-
-										if (var32 == 2) {
-											var24 = 5;
-										}
-
-										if (var32 == 3) {
-											var24 = 6;
-										}
-
-										if (var32 == 4) {
-											var24 = 1001;
-										}
-
-										WorldMapData_0.insertMenuItemNoShift(var29[var32], class16.colorStartTag(65535) + var21.name, var24, var20, var15, var16);
-									}
-								}
-							}
-
-							WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(65535) + var21.name, 1002, var21.id, var15, var16);
-						}
-					}
-
-					int var22;
-					NPC var23;
-					Player var25;
-					int[] var36;
-					int var38;
-					if (var17 == 1) {
-						NPC var33 = Client.npcs[var20];
-						if (var33 == null) {
-							break label319;
-						}
-
-						if (var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) {
-							for (var22 = 0; var22 < Client.npcCount; ++var22) {
-								var23 = Client.npcs[Client.npcIndices[var22]];
-								if (var23 != null && var33 != var23 && var23.definition.size == 1 && var23.x == var33.x && var23.y == var33.y) {
-									class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16);
-								}
-							}
-
-							var22 = Players.Players_count;
-							var36 = Players.Players_indices;
-
-							for (var38 = 0; var38 < var22; ++var38) {
-								var25 = Client.players[var36[var38]];
-								if (var25 != null && var33.x == var25.x && var25.y == var33.y) {
-									class51.addPlayerToMenu(var25, var36[var38], var15, var16);
-								}
-							}
-						}
-
-						class65.addNpcToMenu(var33.definition, var20, var15, var16);
-					}
-
-					if (var17 == 0) {
-						Player var34 = Client.players[var20];
-						if (var34 == null) {
-							break label319;
-						}
-
-						if ((var34.x & 127) == 64 && (var34.y & 127) == 64) {
-							for (var22 = 0; var22 < Client.npcCount; ++var22) {
-								var23 = Client.npcs[Client.npcIndices[var22]];
-								if (var23 != null && var23.definition.size == 1 && var34.x == var23.x && var34.y == var23.y) {
-									class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16);
-								}
-							}
-
-							var22 = Players.Players_count;
-							var36 = Players.Players_indices;
-
-							for (var38 = 0; var38 < var22; ++var38) {
-								var25 = Client.players[var36[var38]];
-								if (var25 != null && var25 != var34 && var25.x == var34.x && var34.y == var25.y) {
-									class51.addPlayerToMenu(var25, var36[var38], var15, var16);
-								}
-							}
-						}
-
-						if (var20 != Client.combatTargetPlayerIndex) {
-							class51.addPlayerToMenu(var34, var20, var15, var16);
-						} else {
-							var4 = var27;
-						}
-					}
-
-					if (var17 == 3) {
-						NodeDeque var35 = Client.groundItems[ItemContainer.plane][var15][var16];
-						if (var35 != null) {
-							for (TileItem var39 = (TileItem)var35.first(); var39 != null; var39 = (TileItem)var35.next()) {
-								ItemDefinition var37 = WorldMapData_0.ItemDefinition_get(var39.id);
-								if (Client.isItemSelected == 1) {
-									WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var16);
-								} else if (Client.isSpellSelected) {
-									if ((WorldMapSectionType.selectedSpellFlags & 1) == 1) {
-										WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var16);
-									}
-								} else {
-									String[] var30 = var37.groundActions;
-
-									for (int var31 = 4; var31 >= 0; --var31) {
-										if (var30 != null && var30[var31] != null) {
-											byte var26 = 0;
-											if (var31 == 0) {
-												var26 = 18;
-											}
-
-											if (var31 == 1) {
-												var26 = 19;
-											}
-
-											if (var31 == 2) {
-												var26 = 20;
-											}
-
-											if (var31 == 3) {
-												var26 = 21;
-											}
-
-											if (var31 == 4) {
-												var26 = 22;
-											}
-
-											WorldMapData_0.insertMenuItemNoShift(var30[var31], class16.colorStartTag(16748608) + var37.name, var26, var39.id, var15, var16);
-										} else if (var31 == 2) {
-											WorldMapData_0.insertMenuItemNoShift("Take", class16.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var16);
-										}
-									}
-
-									WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var16);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			++var8;
-		}
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;B)V",
+		garbageValue = "121"
+	)
+	static final void method3933(String var0) {
+		WorldMapSection2.method283(var0 + " is already on your friend list");
 	}
 }
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -1,27 +1,23 @@
 import java.awt.Component;
 import java.awt.Graphics;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+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("ah")
+@ObfuscatedName("ai")
@Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("ob")
-	@ObfuscatedSignature(
-		signature = "Lfo;"
-	)
-	@Export("mouseWheel")
-	static MouseWheel mouseWheel;
-	@ObfuscatedName("c")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1288652121
+		intValue = 1291773237
 	)
-	static int field389;
-	@ObfuscatedName("s")
+	public static int field395;
+	@ObfuscatedName("c")
 	@Export("component")
 	Component component;

@@ -29,234 +25,515 @@ public final class Canvas extends java.awt.Canvas {
 		this.component = var1;
 	}

-	public final void paint(Graphics var1) {
-		this.component.paint(var1);
-	}
-
 	public final void update(Graphics var1) {
 		this.component.update(var1);
 	}

-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "260955923"
-	)
-	@Export("itemContainerSetItem")
-	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var4 == null) {
-			var4 = new ItemContainer();
-			ItemContainer.itemContainers.put(var4, (long)var0);
-		}
-
-		if (var4.ids.length <= var1) {
-			int[] var5 = new int[var1 + 1];
-			int[] var6 = new int[var1 + 1];
-
-			int var7;
-			for (var7 = 0; var7 < var4.ids.length; ++var7) {
-				var5[var7] = var4.ids[var7];
-				var6[var7] = var4.quantities[var7];
-			}
-
-			for (var7 = var4.ids.length; var7 < var1; ++var7) {
-				var5[var7] = -1;
-				var6[var7] = 0;
-			}
-
-			var4.ids = var5;
-			var4.quantities = var6;
-		}
-
-		var4.ids[var1] = var2;
-		var4.quantities[var1] = var3;
+	public final void paint(Graphics var1) {
+		this.component.paint(var1);
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(ILcr;ZI)I",
-		garbageValue = "65535"
+		signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "1869082478"
 	)
-	static int method806(int var0, Script var1, boolean var2) {
-		int var4 = -1;
-		Widget var3;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			var3 = WorldMapElement.getWidget(var4);
-		} else {
-			var3 = var2 ? class286.field3623 : class297.field3693;
+	@Export("setLoginResponseString")
+	static void setLoginResponseString(String var0, String var1, String var2) {
+		Login.Login_response1 = var0;
+		Login.Login_response2 = var1;
+		Login.Login_response3 = var2;
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-87"
+	)
+	@Export("WorldMapElement_clearCached")
+	public static void WorldMapElement_clearCached() {
+		WorldMapElement.WorldMapElement_cachedSprites.clear();
+	}
+
+	@ObfuscatedName("ay")
+	@ObfuscatedSignature(
+		signature = "(I)I",
+		garbageValue = "1591612905"
+	)
+	@Export("getGcDuration")
+	protected static int getGcDuration() {
+		int var0 = 0;
+		if (GrandExchangeOfferTotalQuantityComparator.garbageCollector == null || !GrandExchangeOfferTotalQuantityComparator.garbageCollector.isValid()) {
+			try {
+				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator();
+
+				while (var1.hasNext()) {
+					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next();
+					if (var2.isValid()) {
+						GrandExchangeOfferTotalQuantityComparator.garbageCollector = var2;
+						GameShell.garbageCollectorLastCheckTimeMs = -1L;
+						GameShell.garbageCollectorLastCollectionTime = -1L;
+					}
+				}
+			} catch (Throwable var11) {
+			}
 		}

-		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			if (var3.scrollX > var3.scrollWidth - var3.width) {
-				var3.scrollX = var3.scrollWidth - var3.width;
+		if (GrandExchangeOfferTotalQuantityComparator.garbageCollector != null) {
+			long var9 = SoundCache.method2480();
+			long var3 = GrandExchangeOfferTotalQuantityComparator.garbageCollector.getCollectionTime();
+			if (GameShell.garbageCollectorLastCollectionTime != -1L) {
+				long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
+				long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
+				if (var7 != 0L) {
+					var0 = (int)(100L * var5 / var7);
+				}
 			}

-			if (var3.scrollX < 0) {
-				var3.scrollX = 0;
+			GameShell.garbageCollectorLastCollectionTime = var3;
+			GameShell.garbageCollectorLastCheckTimeMs = var9;
+		}
+
+		return var0;
+	}
+
+	@ObfuscatedName("gs")
+	@ObfuscatedSignature(
+		signature = "(ZLkt;B)V",
+		garbageValue = "-109"
+	)
+	@Export("loadRegions")
+	static final void loadRegions(boolean var0, PacketBuffer var1) {
+		Client.isInInstance = var0;
+		int var3;
+		int var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		if (!Client.isInInstance) {
+			int var2 = var1.method5514();
+			var3 = var1.method5514();
+			var4 = var1.readUnsignedShort();
+			GrandExchangeOfferAgeComparator.xteaKeys = new int[var4][4];
+
+			for (var5 = 0; var5 < var4; ++var5) {
+				for (var6 = 0; var6 < 4; ++var6) {
+					GrandExchangeOfferAgeComparator.xteaKeys[var5][var6] = var1.readInt();
+				}
 			}

-			var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (var3.scrollY > var3.scrollHeight - var3.height) {
-				var3.scrollY = var3.scrollHeight - var3.height;
+			class197.regions = new int[var4];
+			WorldMapEvent.regionMapArchiveIds = new int[var4];
+			SequenceDefinition.regionLandArchiveIds = new int[var4];
+			MusicPatchPcmStream.regionLandArchives = new byte[var4][];
+			Client.regionMapArchives = new byte[var4][];
+			boolean var16 = false;
+			if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) {
+				var16 = true;
 			}

-			if (var3.scrollY < 0) {
-				var3.scrollY = 0;
+			if (var2 / 8 == 48 && var3 / 8 == 148) {
+				var16 = true;
 			}

-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
-			var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETFILL) {
-			var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETTRANS) {
-			var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
-			var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
-			var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
-			var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETTILING) {
-			var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETMODEL) {
-			var3.modelType = 1;
-			var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
-			Interpreter.Interpreter_intStackSize -= 6;
-			var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-			var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
-			var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4];
-			var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5];
-			FriendSystem.invalidateWidget(var3);
-			return 1;
+			var4 = 0;
+
+			for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) {
+				for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) {
+					var8 = var7 + (var6 << 8);
+					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
+						class197.regions[var4] = var8;
+						WorldMapEvent.regionMapArchiveIds[var4] = Timer.archive5.getGroupId("m" + var6 + "_" + var7);
+						SequenceDefinition.regionLandArchiveIds[var4] = Timer.archive5.getGroupId("l" + var6 + "_" + var7);
+						++var4;
+					}
+				}
+			}
+
+			WorldMapSection2.method301(var2, var3, true);
 		} else {
-			int var8;
-			if (var0 == ScriptOpcodes.CC_SETMODELANIM) {
-				var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				if (var8 != var3.sequenceId) {
-					var3.sequenceId = var8;
-					var3.modelFrame = 0;
-					var3.modelFrameCycle = 0;
-					FriendSystem.invalidateWidget(var3);
+			boolean var15 = var1.method5494() == 1;
+			var3 = var1.readUnsignedShort();
+			var4 = var1.method5459();
+			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();
+			GrandExchangeOfferAgeComparator.xteaKeys = new int[var5][4];
+
+			for (var6 = 0; var6 < var5; ++var6) {
+				for (var7 = 0; var7 < 4; ++var7) {
+					GrandExchangeOfferAgeComparator.xteaKeys[var6][var7] = var1.readInt();
+				}
+			}
+
+			class197.regions = new int[var5];
+			WorldMapEvent.regionMapArchiveIds = new int[var5];
+			SequenceDefinition.regionLandArchiveIds = new int[var5];
+			MusicPatchPcmStream.regionLandArchives = new byte[var5][];
+			Client.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 (class197.regions[var13] == var12) {
+									var12 = -1;
+									break;
+								}
+							}
+
+							if (var12 != -1) {
+								class197.regions[var5] = var12;
+								var13 = var12 >> 8 & 255;
+								int var14 = var12 & 255;
+								WorldMapEvent.regionMapArchiveIds[var5] = Timer.archive5.getGroupId("m" + var13 + "_" + var14);
+								SequenceDefinition.regionLandArchiveIds[var5] = Timer.archive5.getGroupId("l" + var13 + "_" + var14);
+								++var5;
+							}
+						}
+					}
+				}
+			}
+
+			WorldMapSection2.method301(var3, var4, !var15);
+		}
+
+	}
+
+	@ObfuscatedName("gb")
+	@ObfuscatedSignature(
+		signature = "(Lgn;I)V",
+		garbageValue = "1871694401"
+	)
+	static final void method815(class185 var0) {
+		PacketBuffer var1 = Client.packetWriter.packetBuffer;
+		int var3;
+		int var6;
+		int var37;
+		int var38;
+		int var39;
+		int var40;
+		if (class185.field2299 == var0) {
+			var37 = var1.readUnsignedShort();
+			var3 = var1.readUnsignedByteNegate();
+			var38 = (var3 >> 4 & 7) + WorldMapSection1.field286;
+			var39 = (var3 & 7) + ArchiveLoader.field508;
+			var6 = var1.method5459();
+			var40 = var1.readUnsignedByteNegate();
+			if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
+				var38 = var38 * 128 + 64;
+				var39 = var39 * 128 + 64;
+				GraphicsObject var41 = new GraphicsObject(var37, MouseRecorder.plane, var38, var39, WorldMapAreaData.getTileHeight(var38, var39, MouseRecorder.plane) - var40, var6, Client.cycle);
+				Client.graphicsObjects.addFirst(var41);
+			}
+
+		} else {
+			int var31;
+			if (class185.field2303 == var0) {
+				var37 = var1.readUnsignedByte();
+				var3 = (var37 >> 4 & 7) + WorldMapSection1.field286;
+				var38 = (var37 & 7) + ArchiveLoader.field508;
+				var39 = var1.method5494();
+				var6 = var39 >> 2;
+				var40 = var39 & 3;
+				var31 = Client.field682[var6];
+				if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
+					Tiles.updatePendingSpawn(MouseRecorder.plane, var3, var38, var31, -1, var6, var40, 0, -1);
 				}

-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
-				var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETTEXT) {
-				String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-				if (!var7.equals(var3.text)) {
-					var3.text = var7;
-					FriendSystem.invalidateWidget(var3);
-				}
-
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
-				var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
-				Interpreter.Interpreter_intStackSize -= 3;
-				var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
-				var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
-				var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
-				var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
-				var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
-				var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
-				Interpreter.Interpreter_intStackSize -= 2;
-				var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				FriendSystem.invalidateWidget(var3);
-				if (var4 != -1 && var3.type == 0) {
-					WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false);
-				}
-
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
-				GameShell.resumePauseWidget(var3.id, var3.childIndex);
-				Client.meslayerContinueWidget = var3;
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == 1122) {
-				var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
-				var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == 1124) {
-				var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FriendSystem.invalidateWidget(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETFILLMODE) {
-				var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				FillMode var6 = (FillMode)FriendSystem.findEnumerated(SequenceDefinition.FillMode_values(), var8);
-				if (var6 != null) {
-					var3.fillMode = var6;
-					FriendSystem.invalidateWidget(var3);
-				}
-
-				return 1;
 			} else {
-				boolean var5;
-				if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) {
-					var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-					var3.field2601 = var5;
-					return 1;
-				} else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) {
-					var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-					var3.modelTransparency = var5;
-					return 1;
+				byte var4;
+				byte var5;
+				int var9;
+				int var10;
+				int var11;
+				int var12;
+				int var13;
+				int var14;
+				if (class185.field2296 == var0) {
+					var37 = var1.readUnsignedByteNegate();
+					var3 = var1.method5506();
+					var4 = var1.method5634();
+					var5 = var1.method5634();
+					var6 = var1.method5494();
+					var40 = (var6 >> 4 & 7) + WorldMapSection1.field286;
+					var31 = (var6 & 7) + ArchiveLoader.field508;
+					var9 = var1.readUnsignedByteNegate() * 4;
+					var10 = var1.method5514();
+					var11 = var1.method5459();
+					var12 = var1.readUnsignedByte() * 4;
+					var13 = var1.method5514();
+					var14 = var1.readUnsignedByte();
+					var39 = var5 + var40;
+					var38 = var4 + var31;
+					if (var40 >= 0 && var31 >= 0 && var40 < 104 && var31 < 104 && var39 >= 0 && var38 >= 0 && var39 < 104 && var38 < 104 && var10 != 65535) {
+						var40 = var40 * 128 + 64;
+						var31 = var31 * 128 + 64;
+						var39 = var39 * 128 + 64;
+						var38 = var38 * 128 + 64;
+						Projectile var15 = new Projectile(var10, MouseRecorder.plane, var40, var31, WorldMapAreaData.getTileHeight(var40, var31, MouseRecorder.plane) - var12, var13 + Client.cycle, var11 + Client.cycle, var14, var37, var3, var9);
+						var15.setDestination(var39, var38, WorldMapAreaData.getTileHeight(var39, var38, MouseRecorder.plane) - var9, var13 + Client.cycle);
+						Client.projectiles.addFirst(var15);
+					}
+
+				} else if (class185.field2301 == var0) {
+					var37 = var1.method5514();
+					var3 = var1.method5547();
+					var38 = (var3 >> 4 & 7) + WorldMapSection1.field286;
+					var39 = (var3 & 7) + ArchiveLoader.field508;
+					var6 = var1.readUnsignedByteNegate();
+					var40 = var6 >> 2;
+					var31 = var6 & 3;
+					var9 = Client.field682[var40];
+					if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
+						Tiles.updatePendingSpawn(MouseRecorder.plane, var38, var39, var9, var37, var40, var31, 0, -1);
+					}
+
+				} else if (class185.field2304 == var0) {
+					var37 = var1.method5514();
+					var3 = var1.method5494();
+					var38 = (var3 >> 4 & 7) + WorldMapSection1.field286;
+					var39 = (var3 & 7) + ArchiveLoader.field508;
+					var6 = var1.method5494();
+					var40 = var6 >> 2;
+					var31 = var6 & 3;
+					var9 = Client.field682[var40];
+					if (var38 >= 0 && var39 >= 0 && var38 < 103 && var39 < 103) {
+						if (var9 == 0) {
+							BoundaryObject var32 = WorldMapIcon_1.scene.method3063(MouseRecorder.plane, var38, var39);
+							if (var32 != null) {
+								var11 = SecureRandomFuture.Entity_unpackID(var32.tag);
+								if (var40 == 2) {
+									var32.entity1 = new DynamicObject(var11, 2, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var32.entity1);
+									var32.entity2 = new DynamicObject(var11, 2, var31 + 1 & 3, MouseRecorder.plane, var38, var39, var37, false, var32.entity2);
+								} else {
+									var32.entity1 = new DynamicObject(var11, var40, var31, MouseRecorder.plane, var38, var39, var37, false, var32.entity1);
+								}
+							}
+						}
+
+						if (var9 == 1) {
+							WallDecoration var42 = WorldMapIcon_1.scene.method3189(MouseRecorder.plane, var38, var39);
+							if (var42 != null) {
+								var11 = SecureRandomFuture.Entity_unpackID(var42.tag);
+								if (var40 != 4 && var40 != 5) {
+									if (var40 == 6) {
+										var42.entity1 = new DynamicObject(var11, 4, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
+									} else if (var40 == 7) {
+										var42.entity1 = new DynamicObject(var11, 4, (var31 + 2 & 3) + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
+									} else if (var40 == 8) {
+										var42.entity1 = new DynamicObject(var11, 4, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
+										var42.entity2 = new DynamicObject(var11, 4, (var31 + 2 & 3) + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity2);
+									}
+								} else {
+									var42.entity1 = new DynamicObject(var11, 4, var31, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
+								}
+							}
+						}
+
+						if (var9 == 2) {
+							GameObject var43 = WorldMapIcon_1.scene.method3065(MouseRecorder.plane, var38, var39);
+							if (var40 == 11) {
+								var40 = 10;
+							}
+
+							if (var43 != null) {
+								var43.entity = new DynamicObject(SecureRandomFuture.Entity_unpackID(var43.tag), var40, var31, MouseRecorder.plane, var38, var39, var37, false, var43.entity);
+							}
+						}
+
+						if (var9 == 3) {
+							FloorDecoration var44 = WorldMapIcon_1.scene.getFloorDecoration(MouseRecorder.plane, var38, var39);
+							if (var44 != null) {
+								var44.entity = new DynamicObject(SecureRandomFuture.Entity_unpackID(var44.tag), 22, var31, MouseRecorder.plane, var38, var39, var37, false, var44.entity);
+							}
+						}
+					}
+
 				} else {
-					return 2;
+					if (class185.field2297 == var0) {
+						byte var2 = var1.method5634();
+						var3 = var1.readUnsignedShort();
+						var4 = var1.method5497();
+						var5 = var1.method5634();
+						var6 = var1.method5514();
+						byte var7 = var1.method5498();
+						var31 = var1.method5503();
+						var9 = var1.method5514();
+						var10 = var1.readUnsignedByte();
+						var11 = (var10 >> 4 & 7) + WorldMapSection1.field286;
+						var12 = (var10 & 7) + ArchiveLoader.field508;
+						var13 = var1.readUnsignedByte();
+						var14 = var13 >> 2;
+						int var33 = var13 & 3;
+						int var16 = Client.field682[var14];
+						Player var17;
+						if (var9 == Client.localPlayerIndex) {
+							var17 = Varps.localPlayer;
+						} else {
+							var17 = Client.players[var9];
+						}
+
+						if (var17 != null) {
+							ObjectDefinition var18 = WallDecoration.getObjectDefinition(var31);
+							int var19;
+							int var20;
+							if (var33 != 1 && var33 != 3) {
+								var19 = var18.sizeX;
+								var20 = var18.sizeY;
+							} else {
+								var19 = var18.sizeY;
+								var20 = var18.sizeX;
+							}
+
+							int var21 = var11 + (var19 >> 1);
+							int var22 = var11 + (var19 + 1 >> 1);
+							int var23 = var12 + (var20 >> 1);
+							int var24 = var12 + (var20 + 1 >> 1);
+							int[][] var25 = Tiles.Tiles_heights[MouseRecorder.plane];
+							int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2;
+							int var27 = (var11 << 7) + (var19 << 6);
+							int var28 = (var12 << 7) + (var20 << 6);
+							Model var29 = var18.getModel(var14, var33, var25, var27, var26, var28);
+							if (var29 != null) {
+								Tiles.updatePendingSpawn(MouseRecorder.plane, var11, var12, var16, -1, 0, 0, var6 + 1, var3 + 1);
+								var17.animationCycleStart = var6 + Client.cycle;
+								var17.animationCycleEnd = var3 + Client.cycle;
+								var17.model0 = var29;
+								var17.field597 = var11 * 128 + var19 * 64;
+								var17.field599 = var12 * 128 + var20 * 64;
+								var17.tileHeight2 = var26;
+								byte var30;
+								if (var4 > var2) {
+									var30 = var4;
+									var4 = var2;
+									var2 = var30;
+								}
+
+								if (var7 > var5) {
+									var30 = var7;
+									var7 = var5;
+									var5 = var30;
+								}
+
+								var17.field601 = var4 + var11;
+								var17.field609 = var11 + var2;
+								var17.field602 = var7 + var12;
+								var17.field604 = var5 + var12;
+							}
+						}
+					}
+
+					if (class185.field2305 == var0) {
+						var37 = var1.method5547();
+						var3 = (var37 >> 4 & 7) + WorldMapSection1.field286;
+						var38 = (var37 & 7) + ArchiveLoader.field508;
+						var39 = var1.method5547();
+						var6 = var39 >> 4 & 15;
+						var40 = var39 & 7;
+						var31 = var1.readUnsignedShort();
+						var9 = var1.method5547();
+						if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
+							var10 = var6 + 1;
+							if (Varps.localPlayer.pathX[0] >= var3 - var10 && Varps.localPlayer.pathX[0] <= var3 + var10 && Varps.localPlayer.pathY[0] >= var38 - var10 && Varps.localPlayer.pathY[0] <= var38 + var10 && Client.field860 != 0 && var40 > 0 && Client.soundEffectCount < 50) {
+								Client.soundEffectIds[Client.soundEffectCount] = var31;
+								Client.queuedSoundEffectLoops[Client.soundEffectCount] = var40;
+								Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9;
+								Client.soundEffects[Client.soundEffectCount] = null;
+								Client.soundLocations[Client.soundEffectCount] = var6 + (var38 << 8) + (var3 << 16);
+								++Client.soundEffectCount;
+							}
+						}
+					}
+
+					TileItem var35;
+					if (class185.field2298 == var0) {
+						var37 = var1.readUnsignedByte();
+						var3 = (var37 >> 4 & 7) + WorldMapSection1.field286;
+						var38 = (var37 & 7) + ArchiveLoader.field508;
+						var39 = var1.method5514();
+						if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
+							NodeDeque var34 = Client.groundItems[MouseRecorder.plane][var3][var38];
+							if (var34 != null) {
+								for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) {
+									if ((var39 & 32767) == var35.id) {
+										var35.remove();
+										break;
+									}
+								}
+
+								if (var34.last() == null) {
+									Client.groundItems[MouseRecorder.plane][var3][var38] = null;
+								}
+
+								WorldMapCacheName.updateItemPile(var3, var38);
+							}
+						}
+
+					} else if (class185.field2302 == var0) {
+						var37 = var1.method5514();
+						var3 = var1.method5503();
+						var38 = var1.method5547();
+						var39 = (var38 >> 4 & 7) + WorldMapSection1.field286;
+						var6 = (var38 & 7) + ArchiveLoader.field508;
+						if (var39 >= 0 && var6 >= 0 && var39 < 104 && var6 < 104) {
+							var35 = new TileItem();
+							var35.id = var37;
+							var35.quantity = var3;
+							if (Client.groundItems[MouseRecorder.plane][var39][var6] == null) {
+								Client.groundItems[MouseRecorder.plane][var39][var6] = new NodeDeque();
+							}
+
+							Client.groundItems[MouseRecorder.plane][var39][var6].addFirst(var35);
+							WorldMapCacheName.updateItemPile(var39, var6);
+						}
+
+					} else if (class185.field2300 == var0) {
+						var37 = var1.readUnsignedShort();
+						var3 = var1.readUnsignedShort();
+						var38 = var1.method5547();
+						var39 = (var38 >> 4 & 7) + WorldMapSection1.field286;
+						var6 = (var38 & 7) + ArchiveLoader.field508;
+						var40 = var1.method5459();
+						if (var39 >= 0 && var6 >= 0 && var39 < 104 && var6 < 104) {
+							NodeDeque var8 = Client.groundItems[MouseRecorder.plane][var39][var6];
+							if (var8 != null) {
+								for (TileItem var36 = (TileItem)var8.last(); var36 != null; var36 = (TileItem)var8.previous()) {
+									if ((var37 & 32767) == var36.id && var3 == var36.quantity) {
+										var36.quantity = var40;
+										break;
+									}
+								}
+
+								WorldMapCacheName.updateItemPile(var39, var6);
+							}
+						}
+
+					}
 				}
 			}
 		}
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -4,24 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("cg")
+@ObfuscatedName("cs")
@Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "[Lbl;"
-	)
-	@Export("World_worlds")
-	static World[] World_worlds;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "[Lbi;"
+		signature = "[Lbj;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 532462751
+		intValue = 26719133
 	)
 	@Export("count")
 	int count;
@@ -30,10 +24,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbi;",
-		garbageValue = "125041712"
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbj;",
+		garbageValue = "2"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -61,138 +55,159 @@ public class ChatChannel {
 		return var5;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)Lbi;",
-		garbageValue = "673075059"
+		signature = "(II)Lbj;",
+		garbageValue = "-1600519730"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "76"
+		signature = "(S)I",
+		garbageValue = "255"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
-		garbageValue = "1"
+		signature = "(Lhz;Lhz;Lhz;B)V",
+		garbageValue = "-105"
 	)
-	public static void method2163(int var0) {
-		if (class197.field2378 != 0) {
-			WorldMapSprite.field222 = var0;
-		} else {
-			class197.midiPcmStream.method3670(var0);
-		}
-
+	public static void method2220(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+		HitSplatDefinition.HitSplatDefinition_archive = var0;
+		HitSplatDefinition.field3300 = var1;
+		class189.HitSplatDefinition_fontsArchive = var2;
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;II[BII)I",
-		garbageValue = "-1719820728"
+		signature = "(Ljava/lang/CharSequence;I)[B",
+		garbageValue = "1945232856"
 	)
-	@Export("encodeStringCp1252")
-	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
-		int var5 = var2 - var1;
+	public static byte[] method2212(CharSequence var0) {
+		int var1 = var0.length();
+		byte[] var2 = new byte[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;
+		for (int var3 = 0; var3 < var1; ++var3) {
+			char var4 = var0.charAt(var3);
+			if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) {
+				var2[var3] = (byte)var4;
+			} else if (var4 == 8364) {
+				var2[var3] = -128;
+			} else if (var4 == 8218) {
+				var2[var3] = -126;
+			} else if (var4 == 402) {
+				var2[var3] = -125;
+			} else if (var4 == 8222) {
+				var2[var3] = -124;
+			} else if (var4 == 8230) {
+				var2[var3] = -123;
+			} else if (var4 == 8224) {
+				var2[var3] = -122;
+			} else if (var4 == 8225) {
+				var2[var3] = -121;
+			} else if (var4 == 710) {
+				var2[var3] = -120;
+			} else if (var4 == 8240) {
+				var2[var3] = -119;
+			} else if (var4 == 352) {
+				var2[var3] = -118;
+			} else if (var4 == 8249) {
+				var2[var3] = -117;
+			} else if (var4 == 338) {
+				var2[var3] = -116;
+			} else if (var4 == 381) {
+				var2[var3] = -114;
+			} else if (var4 == 8216) {
+				var2[var3] = -111;
+			} else if (var4 == 8217) {
+				var2[var3] = -110;
+			} else if (var4 == 8220) {
+				var2[var3] = -109;
+			} else if (var4 == 8221) {
+				var2[var3] = -108;
+			} else if (var4 == 8226) {
+				var2[var3] = -107;
+			} else if (var4 == 8211) {
+				var2[var3] = -106;
+			} else if (var4 == 8212) {
+				var2[var3] = -105;
+			} else if (var4 == 732) {
+				var2[var3] = -104;
+			} else if (var4 == 8482) {
+				var2[var3] = -103;
+			} else if (var4 == 353) {
+				var2[var3] = -102;
+			} else if (var4 == 8250) {
+				var2[var3] = -101;
+			} else if (var4 == 339) {
+				var2[var3] = -100;
+			} else if (var4 == 382) {
+				var2[var3] = -98;
+			} else if (var4 == 376) {
+				var2[var3] = -97;
 			} else {
-				var3[var6 + var4] = 63;
+				var2[var3] = 63;
 			}
 		}

-		return var5;
+		return var2;
 	}

-	@ObfuscatedName("ac")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "1934933433"
+		signature = "(I)Lli;",
+		garbageValue = "1800491151"
 	)
-	static int method2165(int var0) {
-		return (int)((Math.log((double)var0) / Interpreter.field1078 - 7.0D) * 256.0D);
-	}
+	static Sprite method2218() {
+		Sprite var0 = new Sprite();
+		var0.width = class325.SpriteBuffer_spriteWidth;
+		var0.height = class325.SpriteBuffer_spriteHeight;
+		var0.xOffset = class325.SpriteBuffer_xOffsets[0];
+		var0.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[0];
+		var0.subWidth = class325.SpriteBuffer_spriteWidths[0];
+		var0.subHeight = SoundSystem.SpriteBuffer_spriteHeights[0];
+		int var1 = var0.subWidth * var0.subHeight;
+		byte[] var2 = InvDefinition.SpriteBuffer_pixels[0];
+		var0.pixels = new int[var1];

-	@ObfuscatedName("hg")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-595413655"
-	)
-	static final void method2161() {
-		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
-			if (var0.hitpoints == -1) {
-				var0.delay = 0;
-				WorldMapManager.method607(var0);
-			} else {
-				var0.remove();
-			}
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var0.pixels[var3] = class325.SpriteBuffer_spritePalette[var2[var3] & 255];
 		}

+		class192.SpriteBuffer_clear();
+		return var0;
+	}
+
+	@ObfuscatedName("jx")
+	@ObfuscatedSignature(
+		signature = "(IIIILli;Lhi;I)V",
+		garbageValue = "219480869"
+	)
+	@Export("drawSpriteOnMinimap")
+	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
+		if (var4 != null) {
+			int var6 = Client.camAngleY & 2047;
+			int var7 = var3 * var3 + var2 * var2;
+			if (var7 <= 6400) {
+				int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
+				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
+				int var10 = var9 * var2 + var3 * var8 >> 16;
+				int var11 = var3 * var9 - var8 * var2 >> 16;
+				if (var7 > 2500) {
+					var4.method6102(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
+				} else {
+					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
+				}
+
+			}
+		}
 	}
 }
--- a/runescape-client/src/main/java/ClanChat.java
+++ b/runescape-client/src/main/java/ClanChat.java
@@ -4,163 +4,137 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jl")
+@ObfuscatedName("jz")
@Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("bf")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Llq;"
-	)
-	@Export("worldSelectRightSprite")
-	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("go")
-	@Export("regionLandArchiveIds")
-	static int[] regionLandArchiveIds;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ljs;"
+		signature = "Ljj;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1566602861
+		intValue = 591472141
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 984476847
+		intValue = -1862278063
 	)
-	int field3616;
+	int field3609;

 	@ObfuscatedSignature(
-		signature = "(Llu;Ljs;)V"
+		signature = "(Lll;Ljj;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3616 = 1;
+		this.field3609 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Lju;",
-		garbageValue = "-192021045"
+		signature = "(I)Ljw;",
+		garbageValue = "-734254876"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)[Lju;",
-		garbageValue = "518998026"
+		signature = "(II)[Ljw;",
+		garbageValue = "1353779565"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-16"
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "682747367"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = FaceNormal.base37Decode(var1);
+		String var3 = StudioGame.base37DecodeLong(MouseHandler.method1041(var1));
+		if (var3 == null) {
+			var3 = "";
+		}
+
+		this.name = var3;
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "1"
+		garbageValue = "-7"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = FaceNormal.base37Decode(var1);
+		String var3 = StudioGame.base37DecodeLong(MouseHandler.method1041(var1));
+		if (var3 == null) {
+			var3 = "";
+		}
+
+		this.owner = var3;
 	}

-	@ObfuscatedName("ck")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Lky;B)V",
-		garbageValue = "8"
+		signature = "(Lkz;I)V",
+		garbageValue = "110384625"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		long var5 = var2;
-		String var4;
-		int var7;
-		if (var2 > 0L && var2 < 6582952005840035281L) {
-			if (var2 % 37L == 0L) {
-				var4 = null;
-			} else {
-				var7 = 0;
-
-				for (long var13 = var2; var13 != 0L; 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.readName(GameObject.method3262(var2));
 		this.minKick = var1.readByte();
-		var7 = var1.readUnsignedByte();
-		if (var7 != 255) {
+		int var4 = var1.readUnsignedByte();
+		if (var4 != 255) {
 			this.clear();

-			for (int var8 = 0; var8 < var7; ++var8) {
-				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
-				int var10 = var1.readUnsignedShort();
-				var9.set(var10, ++this.field3616 - 1);
-				var9.rank = var1.readByte();
+			for (int var5 = 0; var5 < var4; ++var5) {
+				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
+				int var7 = var1.readUnsignedShort();
+				var6.set(var7, ++this.field3609 - 1);
+				var6.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
-				this.isLocalPlayer(var9);
+				this.isLocalPlayer(var6);
 			}

 		}
 	}

-	@ObfuscatedName("cc")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lky;I)V",
-		garbageValue = "-1757818732"
+		signature = "(Lkz;I)V",
+		garbageValue = "1536132448"
 	)
-	public final void method5135(Buffer var1) {
+	public final void method5217(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -190,17 +164,17 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}

-			var6.set(var3, ++this.field3616 - 1);
+			var6.set(var3, ++this.field3609 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}

 	}

-	@ObfuscatedName("cd")
+	@ObfuscatedName("cl")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-1788817000"
+		signature = "(B)V",
+		garbageValue = "-116"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -210,10 +184,10 @@ public class ClanChat extends UserList {

 	}

-	@ObfuscatedName("cf")
+	@ObfuscatedName("ca")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-109825958"
+		garbageValue = "1536312249"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -223,10 +197,10 @@ public class ClanChat extends UserList {

 	}

-	@ObfuscatedName("cw")
+	@ObfuscatedName("ck")
 	@ObfuscatedSignature(
-		signature = "(Ljr;I)V",
-		garbageValue = "-54614880"
+		signature = "(Ljl;I)V",
+		garbageValue = "1986230893"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jr")
+@ObfuscatedName("jl")
@Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ljj;"
+		signature = "Ljb;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Ljj;"
+		signature = "Ljb;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -24,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1629200475"
+		signature = "(B)V",
+		garbageValue = "36"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-431370449"
+		garbageValue = "23475902"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -48,30 +48,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-2053877048"
+		garbageValue = "1435568825"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = class32.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = class218.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-72"
+		signature = "(I)V",
+		garbageValue = "-1913743784"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1045653770"
+		garbageValue = "2009413985"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -82,23 +82,13 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1531975898"
+		garbageValue = "83457319"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = class32.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(CB)Z",
-		garbageValue = "96"
-	)
-	@Export("isCharAlphabetic")
-	public static boolean isCharAlphabetic(char var0) {
-		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+		this.ignored = class218.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 }
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -7,40 +7,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("bx")
+@ObfuscatedName("bz")
@Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("s")
+	@ObfuscatedName("qz")
+	@ObfuscatedSignature(
+		signature = "Ldh;"
+	)
+	@Export("pcmPlayer1")
+	static PcmPlayer pcmPlayer1;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1051861033
+		intValue = -312136501
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("gb")
-	@ObfuscatedSignature(
-		signature = "[Llq;"
-	)
-	@Export("scrollBarSprites")
-	static IndexedSprite[] scrollBarSprites;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1686961453
+		intValue = 1319305605
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("parameters")
 	LinkedHashMap parameters;

@@ -53,11 +53,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1763(true);
+		this.method1811(true);
 	}

 	@ObfuscatedSignature(
-		signature = "(Lky;)V"
+		signature = "(Lkz;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -97,26 +97,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1763(true);
+				this.method1811(true);
 			}
 		} else {
-			this.method1763(true);
+			this.method1811(true);
 		}

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "912146837"
+		signature = "(ZB)V",
+		garbageValue = "-20"
 	)
-	void method1763(boolean var1) {
+	void method1811(boolean var1) {
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Lky;",
-		garbageValue = "1073230660"
+		signature = "(I)Lkz;",
+		garbageValue = "215138382"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -2,53 +2,173 @@ 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("fs")
+@ObfuscatedName("fk")
@Implements("Clock")
 public abstract class Clock {
-	@ObfuscatedName("by")
-	static String field2037;
-
 	Clock() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-779324795"
+		garbageValue = "-250719361"
 	)
 	@Export("mark")
 	public abstract void mark();

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(III)I",
-		garbageValue = "930751718"
+		garbageValue = "1652957447"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);

-	@ObfuscatedName("s")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		signature = "(Lhz;IIB)Llq;",
-		garbageValue = "-2"
+		signature = "(ILcu;ZI)I",
+		garbageValue = "1861663871"
 	)
-	@Export("SpriteBuffer_getIndexedSprite")
-	static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) {
-		if (!World.SpriteBuffer_bufferFile(var0, var1, var2)) {
-			return null;
+	static int method3490(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
+			return 1;
 		} else {
-			IndexedSprite var4 = new IndexedSprite();
-			var4.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
-			var4.height = class325.SpriteBuffer_spriteHeight;
-			var4.xOffset = class325.SpriteBuffer_xOffsets[0];
-			var4.yOffset = class325.SpriteBuffer_yOffsets[0];
-			var4.subWidth = class325.SpriteBuffer_spriteWidths[0];
-			var4.subHeight = class225.SpriteBuffer_spriteHeights[0];
-			var4.palette = class325.SpriteBuffer_spritePalette;
-			var4.pixels = WorldMapSection1.SpriteBuffer_pixels[0];
-			UserComparator7.SpriteBuffer_clear();
-			return var4;
+			int var12;
+			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
+				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+				var12 = Client.grandExchangeOffers[var3].status();
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
+				return 1;
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
+				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+				var12 = Client.grandExchangeOffers[var3].status();
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
+				return 1;
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
+				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+				var12 = Client.grandExchangeOffers[var3].status();
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
+				return 1;
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
+				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+				var12 = Client.grandExchangeOffers[var3].status();
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
+				return 1;
+			} else {
+				boolean var13;
+				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
+					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
+					if (PacketWriter.grandExchangeEvents != null) {
+						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
+					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
+					if (PacketWriter.grandExchangeEvents != null) {
+						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
+					class160.Interpreter_intStackSize -= 2;
+					var13 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] == 1;
+					boolean var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1;
+					if (PacketWriter.grandExchangeEvents != null) {
+						Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
+						PacketWriter.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
+					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
+					if (PacketWriter.grandExchangeEvents != null) {
+						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
+					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
+					if (PacketWriter.grandExchangeEvents != null) {
+						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = PacketWriter.grandExchangeEvents == null ? 0 : PacketWriter.grandExchangeEvents.events.size();
+					return 1;
+				} else {
+					GrandExchangeEvent var11;
+					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.world;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var11.getOfferName();
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						long var5 = SoundCache.method2480() - GrandExchangeOfferWorldComparator.field25 - 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[++TextureProvider.Interpreter_stringStackSize - 1] = var10;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
+						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
+						return 1;
+					} else {
+						return 2;
+					}
+				}
+			}
 		}
 	}
 }
--- a/runescape-client/src/main/java/CollisionMap.java
+++ b/runescape-client/src/main/java/CollisionMap.java
@@ -4,34 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("fm")
+@ObfuscatedName("fj")
@Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("at")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 379779745
+		intValue = 1935458159
+	)
+	@Export("VarpDefinition_fileCount")
+	public static int VarpDefinition_fileCount;
+	@ObfuscatedName("ad")
+	@ObfuscatedGetter(
+		intValue = -1822416471
 	)
 	@Export("xInset")
-	public int xInset;
-	@ObfuscatedName("as")
+	int xInset;
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 899493249
+		intValue = 711877459
 	)
 	@Export("yInset")
-	public int yInset;
-	@ObfuscatedName("ak")
+	int yInset;
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -67571785
+		intValue = 942404383
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1623106677
+		intValue = 1645469007
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ab")
 	@Export("flags")
 	public int[][] flags;

@@ -44,10 +50,10 @@ public class CollisionMap {
 		this.clear();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(S)V",
-		garbageValue = "8482"
+		signature = "(I)V",
+		garbageValue = "1948261737"
 	)
 	@Export("clear")
 	public void clear() {
@@ -63,12 +69,12 @@ public class CollisionMap {

 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
-		garbageValue = "-37"
+		signature = "(IIIIZI)V",
+		garbageValue = "807460009"
 	)
-	public void method3495(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3534(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -215,10 +221,10 @@ public class CollisionMap {

 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
-		garbageValue = "-1939556917"
+		signature = "(IIIIZB)V",
+		garbageValue = "-41"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -242,10 +248,10 @@ public class CollisionMap {

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(III)V",
-		garbageValue = "-2081310668"
+		signature = "(IIB)V",
+		garbageValue = "116"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -255,10 +261,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(IIS)V",
-		garbageValue = "5864"
+		signature = "(IIB)V",
+		garbageValue = "0"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -268,10 +274,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(IIIB)V",
-		garbageValue = "79"
+		signature = "(IIII)V",
+		garbageValue = "-1965469777"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -279,12 +285,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
-		garbageValue = "1397124488"
+		signature = "(IIIIZB)V",
+		garbageValue = "-91"
 	)
-	public void method3497(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3536(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -431,10 +437,10 @@ public class CollisionMap {

 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(IIIIIZB)V",
-		garbageValue = "25"
+		signature = "(IIIIIZI)V",
+		garbageValue = "-1821218728"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -464,10 +470,10 @@ public class CollisionMap {

 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(IIII)V",
-		garbageValue = "1656686360"
+		garbageValue = "-156666572"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -475,37 +481,15 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}

-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-1414783341"
+		garbageValue = "848915256"
 	)
-	public void method3527(int var1, int var2) {
+	public void method3541(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(Lhz;I)V",
-		garbageValue = "-1914788069"
-	)
-	@Export("FloorUnderlayDefinition_setArchives")
-	public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) {
-		FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0;
-	}
-
-	@ObfuscatedName("js")
-	@ObfuscatedSignature(
-		signature = "(IS)V",
-		garbageValue = "-3946"
-	)
-	@Export("drawInterfaceModelComponents")
-	static final void drawInterfaceModelComponents(int var0) {
-		if (Projectile.loadInterface(var0)) {
-			Tile.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1);
-		}
-	}
 }
--- a/runescape-client/src/main/java/Coord.java
+++ b/runescape-client/src/main/java/Coord.java
@@ -4,44 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("hd")
+@ObfuscatedName("hj")
@Implements("Coord")
 public class Coord {
-	@ObfuscatedName("m")
-	@Export("BZip2Decompressor_block")
-	static int[] BZip2Decompressor_block;
-	@ObfuscatedName("dc")
-	@ObfuscatedGetter(
-		longValue = 8705560174832439427L
+	@ObfuscatedName("aw")
+	@Export("client")
+	@ObfuscatedSignature(
+		signature = "Lclient;"
 	)
-	static long field2511;
-	@ObfuscatedName("hp")
+	static Client client;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -312378443
-	)
-	@Export("cameraY")
-	static int cameraY;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -22513413
+		intValue = -275324431
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -611305657
-	)
-	@Export("x")
-	public int x;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -2088749017
+		intValue = 1946522259
 	)
 	@Export("y")
 	public int y;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 212884917
+	)
+	@Export("x")
+	public int x;

 	@ObfuscatedSignature(
-		signature = "(Lhd;)V"
+		signature = "(Lhj;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -66,20 +58,20 @@ public class Coord {

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "2"
+		garbageValue = "94"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lhd;B)Z",
-		garbageValue = "-61"
+		signature = "(Lhj;I)Z",
+		garbageValue = "49953005"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -92,20 +84,16 @@ public class Coord {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1334181457"
+		garbageValue = "-2113109490"
 	)
 	@Export("toString")
 	String toString(String var1) {
 		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63);
 	}

-	public String toString() {
-		return this.toString(",");
-	}
-
 	public boolean equals(Object var1) {
 		if (this == var1) {
 			return true;
@@ -118,11 +106,28 @@ public class Coord {
 		return this.packed();
 	}

-	public String abd() {
+	public String aai() {
 		return this.toString(",");
 	}

-	public String abb() {
+	public String aar() {
 		return this.toString(",");
 	}
+
+	public String aan() {
+		return this.toString(",");
+	}
+
+	public String toString() {
+		return this.toString(",");
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "(B)[Lcl;",
+		garbageValue = "69"
+	)
+	static AttackOption[] method3981() {
+		return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
+	}
 }
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -3,86 +3,85 @@ 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("db")
+@ObfuscatedName("de")
@Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "Lky;"
-	)
-	@Export("NetCache_reference")
-	static Buffer NetCache_reference;
-	@ObfuscatedName("l")
-	public static String field1439;
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		signature = "Llh;"
-	)
-	static Bounds field1443;
-	@ObfuscatedName("bq")
-	@ObfuscatedSignature(
-		signature = "[Llq;"
-	)
-	@Export("worldSelectArrows")
-	static IndexedSprite[] worldSelectArrows;
-	@ObfuscatedName("k")
+	@ObfuscatedName("et")
 	@ObfuscatedGetter(
-		intValue = -617171721
+		intValue = -722271125
+	)
+	static int field1431;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = -313653259
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 72965647
+		intValue = -172648561
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("table")
 	int[][] table;

 	public Decimator(int var1, int var2) {
 		if (var2 != var1) {
-			int var3 = WorldMapIcon_1.method301(var1, var2);
-			var1 /= var3;
-			var2 /= var3;
+			int var4 = var1;
+			int var5 = var2;
+			if (var2 > var1) {
+				var4 = var2;
+				var5 = var1;
+			}
+
+			while (var5 != 0) {
+				int var6 = var4 % var5;
+				var4 = var5;
+				var5 = var6;
+			}
+
+			var1 /= var4;
+			var2 /= var4;
 			this.inputRate = var1;
 			this.outputRate = var2;
 			this.table = new int[var1][14];

-			for (int var4 = 0; var4 < var1; ++var4) {
-				int[] var5 = this.table[var4];
-				double var6 = 6.0D + (double)var4 / (double)var1;
-				int var8 = (int)Math.floor(var6 - 7.0D + 1.0D);
-				if (var8 < 0) {
-					var8 = 0;
+			for (int var7 = 0; var7 < var1; ++var7) {
+				int[] var8 = this.table[var7];
+				double var9 = 6.0D + (double)var7 / (double)var1;
+				int var11 = (int)Math.floor(1.0D + (var9 - 7.0D));
+				if (var11 < 0) {
+					var11 = 0;
 				}

-				int var9 = (int)Math.ceil(var6 + 7.0D);
-				if (var9 > 14) {
-					var9 = 14;
+				int var12 = (int)Math.ceil(7.0D + var9);
+				if (var12 > 14) {
+					var12 = 14;
 				}

-				for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) {
-					double var12 = ((double)var8 - var6) * 3.141592653589793D;
-					double var14 = var10;
-					if (var12 < -1.0E-4D || var12 > 1.0E-4D) {
-						var14 = var10 * (Math.sin(var12) / var12);
+				for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
+					double var15 = 3.141592653589793D * ((double)var11 - var9);
+					double var17 = var13;
+					if (var15 < -1.0E-4D || var15 > 1.0E-4D) {
+						var17 = var13 * (Math.sin(var15) / var15);
 					}

-					var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D);
-					var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D);
+					var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
+					var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D);
 				}
 			}

 		}
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "([BB)[B",
-		garbageValue = "1"
+		garbageValue = "63"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
@@ -99,7 +98,7 @@ public class Decimator {

 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var9 + var4] += var7 * var8[var9];
+					var3[var9 + var4] += var8[var9] * var7;
 				}

 				var5 += this.outputRate;
@@ -125,10 +124,10 @@ public class Decimator {
 		return var1;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-2098361715"
+		garbageValue = "-749198393"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
@@ -139,10 +138,10 @@ public class Decimator {
 		return var1;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IB)I",
-		garbageValue = "45"
+		garbageValue = "-106"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
@@ -153,80 +152,595 @@ public class Decimator {
 		return var1;
 	}

-	@ObfuscatedName("s")
-	public static final int method2452(double var0, double var2, double var4) {
-		double var6 = var4;
-		double var8 = var4;
-		double var10 = var4;
-		if (0.0D != var2) {
-			double var12;
-			if (var4 < 0.5D) {
-				var12 = (var2 + 1.0D) * var4;
-			} else {
-				var12 = var4 + var2 - var4 * var2;
-			}
-
-			double var14 = 2.0D * var4 - var12;
-			double var16 = 0.3333333333333333D + var0;
-			if (var16 > 1.0D) {
-				--var16;
-			}
-
-			double var20 = var0 - 0.3333333333333333D;
-			if (var20 < 0.0D) {
-				++var20;
-			}
-
-			if (var16 * 6.0D < 1.0D) {
-				var6 = var16 * 6.0D * (var12 - var14) + var14;
-			} else if (2.0D * var16 < 1.0D) {
-				var6 = var12;
-			} else if (3.0D * var16 < 2.0D) {
-				var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14;
-			} else {
-				var6 = var14;
-			}
-
-			if (6.0D * var0 < 1.0D) {
-				var8 = var14 + (var12 - var14) * 6.0D * var0;
-			} else if (var0 * 2.0D < 1.0D) {
-				var8 = var12;
-			} else if (3.0D * var0 < 2.0D) {
-				var8 = 6.0D * (var12 - var14) * (0.6666666666666666D - var0) + var14;
-			} else {
-				var8 = var14;
-			}
-
-			if (var20 * 6.0D < 1.0D) {
-				var10 = var20 * 6.0D * (var12 - var14) + var14;
-			} else if (2.0D * var20 < 1.0D) {
-				var10 = var12;
-			} else if (var20 * 3.0D < 2.0D) {
-				var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14;
-			} else {
-				var10 = var14;
-			}
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "-2091115234"
+	)
+	public static void method2499(int var0) {
+		if (class197.field2376 != 0) {
+			Canvas.field395 = var0;
+		} else {
+			class197.midiPcmStream.method3686(var0);
 		}

-		int var22 = (int)(var6 * 256.0D);
-		int var13 = (int)(var8 * 256.0D);
-		int var23 = (int)(256.0D * var10);
-		int var15 = var23 + (var13 << 8) + (var22 << 16);
-		return var15;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		signature = "(III)I",
-		garbageValue = "-882236217"
+		signature = "(ILcu;ZB)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;
+	static int method2494(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
+			class160.Interpreter_intStackSize -= 2;
+			Client.field873 = (short)class1.method17(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]);
+			if (Client.field873 <= 0) {
+				Client.field873 = 256;
+			}
+
+			Client.field752 = (short)class1.method17(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]);
+			if (Client.field752 <= 0) {
+				Client.field752 = 256;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
+			class160.Interpreter_intStackSize -= 2;
+			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			if (Client.zoomHeight <= 0) {
+				Client.zoomHeight = 256;
+			}
+
+			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			if (Client.zoomWidth <= 0) {
+				Client.zoomWidth = 320;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
+			class160.Interpreter_intStackSize -= 4;
+			Client.field877 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			if (Client.field877 <= 0) {
+				Client.field877 = 1;
+			}
+
+			Client.field878 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			if (Client.field878 <= 0) {
+				Client.field878 = 32767;
+			} else if (Client.field878 < Client.field877) {
+				Client.field878 = Client.field877;
+			}
+
+			Client.field879 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
+			if (Client.field879 <= 0) {
+				Client.field879 = 1;
+			}
+
+			Client.field717 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
+			if (Client.field717 <= 0) {
+				Client.field717 = 32767;
+			} else if (Client.field717 < Client.field879) {
+				Client.field717 = Client.field879;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
+			if (Client.viewportWidget != null) {
+				DesktopPlatformInfoProvider.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.viewportWidth;
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.viewportHeight;
+			} else {
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.zoomHeight;
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.zoomWidth;
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapLabel.method381(Client.field873);
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapLabel.method381(Client.field752);
+			return 1;
+		} else if (var0 == 6220) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6221) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6222) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GraphicsDefaults.canvasWidth;
+			return 1;
+		} else if (var0 == 6223) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GameShell.canvasHeight;
+			return 1;
 		} else {
-			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0;
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("ei")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1128100526"
+	)
+	@Export("load")
+	static void load() {
+		int var0;
+		if (Client.titleLoadingStage == 0) {
+			WorldMapIcon_1.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
+
+			for (var0 = 0; var0 < 4; ++var0) {
+				Client.collisionMaps[var0] = new CollisionMap(104, 104);
+			}
+
+			class60.sceneMinimapSprite = new Sprite(512, 512);
+			Login.Login_loadingText = "Starting game engine...";
+			Login.Login_loadingPercent = 5;
+			Client.titleLoadingStage = 20;
+		} else if (Client.titleLoadingStage == 20) {
+			Login.Login_loadingText = "Prepared visibility map";
+			Login.Login_loadingPercent = 10;
+			Client.titleLoadingStage = 30;
+		} else if (Client.titleLoadingStage == 30) {
+			ScriptEvent.archive0 = FloorOverlayDefinition.newArchive(0, false, true, true);
+			GrandExchangeOffer.archive1 = FloorOverlayDefinition.newArchive(1, false, true, true);
+			class173.archive2 = FloorOverlayDefinition.newArchive(2, true, false, true);
+			WorldMapData_0.archive3 = FloorOverlayDefinition.newArchive(3, false, true, true);
+			class13.archive4 = FloorOverlayDefinition.newArchive(4, false, true, true);
+			Timer.archive5 = FloorOverlayDefinition.newArchive(5, true, true, true);
+			WorldMapDecoration.archive6 = FloorOverlayDefinition.newArchive(6, true, true, true);
+			class49.archive7 = FloorOverlayDefinition.newArchive(7, false, true, true);
+			WorldMapDecoration.archive8 = FloorOverlayDefinition.newArchive(8, false, true, true);
+			WorldMapData_0.archive9 = FloorOverlayDefinition.newArchive(9, false, true, true);
+			FontName.archive10 = FloorOverlayDefinition.newArchive(10, false, true, true);
+			ArchiveDisk.archive11 = FloorOverlayDefinition.newArchive(11, false, true, true);
+			Message.archive12 = FloorOverlayDefinition.newArchive(12, false, true, true);
+			TextureProvider.archive13 = FloorOverlayDefinition.newArchive(13, true, false, true);
+			WorldMapLabel.archive14 = FloorOverlayDefinition.newArchive(14, false, true, true);
+			BufferedSource.archive15 = FloorOverlayDefinition.newArchive(15, false, true, true);
+			class49.archive17 = FloorOverlayDefinition.newArchive(17, true, true, true);
+			WorldMapArea.archive18 = FloorOverlayDefinition.newArchive(18, false, true, true);
+			UrlRequest.archive19 = FloorOverlayDefinition.newArchive(19, false, true, true);
+			WorldMapSection1.archive20 = FloorOverlayDefinition.newArchive(20, false, true, true);
+			Login.Login_loadingText = "Connecting to update server";
+			Login.Login_loadingPercent = 20;
+			Client.titleLoadingStage = 40;
+		} else if (Client.titleLoadingStage == 40) {
+			byte var24 = 0;
+			var0 = var24 + ScriptEvent.archive0.percentage() * 4 / 100;
+			var0 += GrandExchangeOffer.archive1.percentage() * 4 / 100;
+			var0 += class173.archive2.percentage() * 2 / 100;
+			var0 += WorldMapData_0.archive3.percentage() * 2 / 100;
+			var0 += class13.archive4.percentage() * 6 / 100;
+			var0 += Timer.archive5.percentage() * 4 / 100;
+			var0 += WorldMapDecoration.archive6.percentage() * 2 / 100;
+			var0 += class49.archive7.percentage() * 56 / 100;
+			var0 += WorldMapDecoration.archive8.percentage() * 2 / 100;
+			var0 += WorldMapData_0.archive9.percentage() * 2 / 100;
+			var0 += FontName.archive10.percentage() * 2 / 100;
+			var0 += ArchiveDisk.archive11.percentage() * 2 / 100;
+			var0 += Message.archive12.percentage() * 2 / 100;
+			var0 += TextureProvider.archive13.percentage() * 2 / 100;
+			var0 += WorldMapLabel.archive14.percentage() * 2 / 100;
+			var0 += BufferedSource.archive15.percentage() * 2 / 100;
+			var0 += UrlRequest.archive19.percentage() / 100;
+			var0 += WorldMapArea.archive18.percentage() / 100;
+			var0 += WorldMapSection1.archive20.percentage() / 100;
+			var0 += class49.archive17.method4265() && class49.archive17.isFullyLoaded() ? 1 : 0;
+			if (var0 != 100) {
+				if (var0 != 0) {
+					Login.Login_loadingText = "Checking for updates - " + var0 + "%";
+				}
+
+				Login.Login_loadingPercent = 30;
+			} else {
+				class14.method142(ScriptEvent.archive0, "Animations");
+				class14.method142(GrandExchangeOffer.archive1, "Skeletons");
+				class14.method142(class13.archive4, "Sound FX");
+				class14.method142(Timer.archive5, "Maps");
+				class14.method142(WorldMapDecoration.archive6, "Music Tracks");
+				class14.method142(class49.archive7, "Models");
+				class14.method142(WorldMapDecoration.archive8, "Sprites");
+				class14.method142(ArchiveDisk.archive11, "Music Jingles");
+				class14.method142(WorldMapLabel.archive14, "Music Samples");
+				class14.method142(BufferedSource.archive15, "Music Patches");
+				class14.method142(UrlRequest.archive19, "World Map");
+				class14.method142(WorldMapArea.archive18, "World Map Geography");
+				class14.method142(WorldMapSection1.archive20, "World Map Ground");
+				Frames.spriteIds = new GraphicsDefaults();
+				Frames.spriteIds.decode(class49.archive17);
+				Login.Login_loadingText = "Loaded update list";
+				Login.Login_loadingPercent = 30;
+				Client.titleLoadingStage = 45;
+			}
+		} else if (Client.titleLoadingStage == 45) {
+			Login.PcmPlayer_configure(22050, !Client.isLowDetail, 2);
+			MidiPcmStream var26 = new MidiPcmStream();
+			var26.method3732(9, 128);
+			WorldMapIcon_1.pcmPlayer0 = PacketWriter.method2246(GameShell.taskHandler, 0, 22050);
+			WorldMapIcon_1.pcmPlayer0.setStream(var26);
+			class192.setAudioArchives(BufferedSource.archive15, WorldMapLabel.archive14, class13.archive4, var26);
+			ClientPreferences.pcmPlayer1 = PacketWriter.method2246(GameShell.taskHandler, 1, 2048);
+			class51.pcmStreamMixer = new PcmStreamMixer();
+			ClientPreferences.pcmPlayer1.setStream(class51.pcmStreamMixer);
+			class81.decimator = new Decimator(22050, GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate);
+			Login.Login_loadingText = "Prepared sound engine";
+			Login.Login_loadingPercent = 35;
+			Client.titleLoadingStage = 50;
+			GraphicsObject.WorldMapElement_fonts = new Fonts(WorldMapDecoration.archive8, TextureProvider.archive13);
+		} else if (Client.titleLoadingStage == 50) {
+			var0 = FontName.method5288().length;
+			Client.fontsMap = GraphicsObject.WorldMapElement_fonts.createMap(FontName.method5288());
+			if (Client.fontsMap.size() < var0) {
+				Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var0 + "%";
+				Login.Login_loadingPercent = 40;
+			} else {
+				GrandExchangeEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
+				class197.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12);
+				HealthBar.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12);
+				class32.platformInfo = Client.platformInfoProvider.get();
+				Login.Login_loadingText = "Loaded fonts";
+				Login.Login_loadingPercent = 40;
+				Client.titleLoadingStage = 60;
+			}
+		} else {
+			Archive var2;
+			int var3;
+			Archive var20;
+			int var23;
+			if (Client.titleLoadingStage == 60) {
+				var20 = FontName.archive10;
+				var2 = WorldMapDecoration.archive8;
+				var3 = 0;
+				if (var20.tryLoadFileByNames("title.jpg", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("logo", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("logo_deadman_mode", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("titlebox", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("titlebutton", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("runes", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("title_mute", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) {
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) {
+					++var3;
+				}
+
+				var2.tryLoadFileByNames("sl_back", "");
+				var2.tryLoadFileByNames("sl_flags", "");
+				var2.tryLoadFileByNames("sl_arrows", "");
+				var2.tryLoadFileByNames("sl_stars", "");
+				var2.tryLoadFileByNames("sl_button", "");
+				var23 = AbstractWorldMapIcon.method587();
+				if (var3 < var23) {
+					Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var23 + "%";
+					Login.Login_loadingPercent = 50;
+				} else {
+					Login.Login_loadingText = "Loaded title screen";
+					Login.Login_loadingPercent = 50;
+					WorldMapIcon_0.updateGameState(5);
+					Client.titleLoadingStage = 70;
+				}
+			} else if (Client.titleLoadingStage == 70) {
+				if (!class173.archive2.isFullyLoaded()) {
+					Login.Login_loadingText = "Loading config - " + class173.archive2.loadPercent() + "%";
+					Login.Login_loadingPercent = 60;
+				} else {
+					Player.method1228(class173.archive2);
+					Archive var25 = class173.archive2;
+					FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var25;
+					WorldMapID.method526(class173.archive2, class49.archive7);
+					var20 = class173.archive2;
+					var2 = class49.archive7;
+					boolean var21 = Client.isLowDetail;
+					GrandExchangeOfferNameComparator.ObjectDefinition_archive = var20;
+					ObjectDefinition.ObjectDefinition_modelsArchive = var2;
+					ObjectDefinition.ObjectDefinition_isLowDetail = var21;
+					GameObject.NpcDefinition_setArchives(class173.archive2, class49.archive7);
+					class188.method3617(class173.archive2);
+					GrandExchangeEvents.method69(class173.archive2, class49.archive7, Client.isMembersWorld, GrandExchangeEvent.fontPlain11);
+					Archive var17 = class173.archive2;
+					Archive var22 = ScriptEvent.archive0;
+					Archive var6 = GrandExchangeOffer.archive1;
+					SequenceDefinition.SequenceDefinition_archive = var17;
+					SequenceDefinition.SequenceDefinition_animationsArchive = var22;
+					SequenceDefinition.SequenceDefinition_skeletonsArchive = var6;
+					Archive var7 = class173.archive2;
+					Archive var8 = class49.archive7;
+					SpotAnimationDefinition.SpotAnimationDefinition_archive = var7;
+					SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var8;
+					Archive var9 = class173.archive2;
+					VarbitDefinition.VarbitDefinition_archive = var9;
+					Archive var10 = class173.archive2;
+					class297.VarpDefinition_archive = var10;
+					CollisionMap.VarpDefinition_fileCount = class297.VarpDefinition_archive.getGroupFileCount(16);
+					class162.Widget_setArchives(WorldMapData_0.archive3, class49.archive7, WorldMapDecoration.archive8, TextureProvider.archive13);
+					PcmPlayer.InvDefinition_setArchives(class173.archive2);
+					Archive var11 = class173.archive2;
+					EnumDefinition.EnumDefinition_archive = var11;
+					class293.method5298(class173.archive2);
+					VarcInt.method4407(class173.archive2);
+					BoundaryObject.varcs = new Varcs();
+					ChatChannel.method2220(class173.archive2, WorldMapDecoration.archive8, TextureProvider.archive13);
+					NPCDefinition.method4749(class173.archive2, WorldMapDecoration.archive8);
+					Archive var12 = class173.archive2;
+					Archive var13 = WorldMapDecoration.archive8;
+					WorldMapElement.WorldMapElement_archive = var13;
+					if (var12.isFullyLoaded()) {
+						WorldMapElement.WorldMapElement_count = var12.getGroupFileCount(35);
+						WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count];
+
+						for (int var14 = 0; var14 < WorldMapElement.WorldMapElement_count; ++var14) {
+							byte[] var15 = var12.takeFile(35, var14);
+							WorldMapElement.WorldMapElement_cached[var14] = new WorldMapElement(var14);
+							if (var15 != null) {
+								WorldMapElement.WorldMapElement_cached[var14].decode(new Buffer(var15));
+								WorldMapElement.WorldMapElement_cached[var14].method4378();
+							}
+						}
+					}
+
+					Login.Login_loadingText = "Loaded config";
+					Login.Login_loadingPercent = 60;
+					Client.titleLoadingStage = 80;
+				}
+			} else if (Client.titleLoadingStage == 80) {
+				var0 = 0;
+				if (UrlRequest.compass == null) {
+					UrlRequest.compass = FillMode.SpriteBuffer_getSprite(WorldMapDecoration.archive8, Frames.spriteIds.compass, 0);
+				} else {
+					++var0;
+				}
+
+				if (FontName.redHintArrowSprite == null) {
+					FontName.redHintArrowSprite = FillMode.SpriteBuffer_getSprite(WorldMapDecoration.archive8, Frames.spriteIds.field3794, 0);
+				} else {
+					++var0;
+				}
+
+				IndexedSprite[] var1;
+				boolean var4;
+				byte[] var5;
+				if (class287.mapSceneSprites == null) {
+					var2 = WorldMapDecoration.archive8;
+					var3 = Frames.spriteIds.mapScenes;
+					var5 = var2.takeFile(var3, 0);
+					if (var5 == null) {
+						var4 = false;
+					} else {
+						GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5);
+						var4 = true;
+					}
+
+					if (!var4) {
+						var1 = null;
+					} else {
+						var1 = FileSystem.method3489();
+					}
+
+					class287.mapSceneSprites = var1;
+				} else {
+					++var0;
+				}
+
+				if (PlatformInfo.headIconPkSprites == null) {
+					PlatformInfo.headIconPkSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.headIconsPk, 0);
+				} else {
+					++var0;
+				}
+
+				if (RouteStrategy.headIconPrayerSprites == null) {
+					RouteStrategy.headIconPrayerSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3797, 0);
+				} else {
+					++var0;
+				}
+
+				if (GrandExchangeEvents.headIconHintSprites == null) {
+					GrandExchangeEvents.headIconHintSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3798, 0);
+				} else {
+					++var0;
+				}
+
+				if (WorldMapLabelSize.mapMarkerSprites == null) {
+					WorldMapLabelSize.mapMarkerSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3800, 0);
+				} else {
+					++var0;
+				}
+
+				if (class270.crossSprites == null) {
+					class270.crossSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3804, 0);
+				} else {
+					++var0;
+				}
+
+				if (class42.mapDotSprites == null) {
+					class42.mapDotSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3801, 0);
+				} else {
+					++var0;
+				}
+
+				if (WorldMapIcon_1.scrollBarSprites == null) {
+					var2 = WorldMapDecoration.archive8;
+					var3 = Frames.spriteIds.field3802;
+					var5 = var2.takeFile(var3, 0);
+					if (var5 == null) {
+						var4 = false;
+					} else {
+						GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5);
+						var4 = true;
+					}
+
+					if (!var4) {
+						var1 = null;
+					} else {
+						var1 = FileSystem.method3489();
+					}
+
+					WorldMapIcon_1.scrollBarSprites = var1;
+				} else {
+					++var0;
+				}
+
+				if (SecureRandomCallable.modIconSprites == null) {
+					var2 = WorldMapDecoration.archive8;
+					var3 = Frames.spriteIds.field3799;
+					var5 = var2.takeFile(var3, 0);
+					if (var5 == null) {
+						var4 = false;
+					} else {
+						GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5);
+						var4 = true;
+					}
+
+					if (!var4) {
+						var1 = null;
+					} else {
+						var1 = FileSystem.method3489();
+					}
+
+					SecureRandomCallable.modIconSprites = var1;
+				} else {
+					++var0;
+				}
+
+				if (var0 < 11) {
+					Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%";
+					Login.Login_loadingPercent = 70;
+				} else {
+					AbstractFont.AbstractFont_modIconSprites = SecureRandomCallable.modIconSprites;
+					FontName.redHintArrowSprite.normalize();
+					int var18 = (int)(Math.random() * 21.0D) - 10;
+					int var19 = (int)(Math.random() * 21.0D) - 10;
+					var3 = (int)(Math.random() * 21.0D) - 10;
+					var23 = (int)(Math.random() * 41.0D) - 20;
+					class287.mapSceneSprites[0].shiftColors(var23 + var18, var19 + var23, var3 + var23);
+					Login.Login_loadingText = "Loaded sprites";
+					Login.Login_loadingPercent = 70;
+					Client.titleLoadingStage = 90;
+				}
+			} else if (Client.titleLoadingStage == 90) {
+				if (!WorldMapData_0.archive9.isFullyLoaded()) {
+					Login.Login_loadingText = "Loading textures - " + "0%";
+					Login.Login_loadingPercent = 90;
+				} else {
+					class216.textureProvider = new TextureProvider(WorldMapData_0.archive9, WorldMapDecoration.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
+					Rasterizer3D.Rasterizer3D_setTextureLoader(class216.textureProvider);
+					Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
+					Client.titleLoadingStage = 100;
+				}
+			} else if (Client.titleLoadingStage == 100) {
+				var0 = class216.textureProvider.getLoadedPercentage();
+				if (var0 < 100) {
+					Login.Login_loadingText = "Loading textures - " + var0 + "%";
+					Login.Login_loadingPercent = 90;
+				} else {
+					Login.Login_loadingText = "Loaded textures";
+					Login.Login_loadingPercent = 90;
+					Client.titleLoadingStage = 110;
+				}
+			} else if (Client.titleLoadingStage == 110) {
+				ParamDefinition.mouseRecorder = new MouseRecorder();
+				GameShell.taskHandler.newThreadTask(ParamDefinition.mouseRecorder, 10);
+				Login.Login_loadingText = "Loaded input handler";
+				Login.Login_loadingPercent = 92;
+				Client.titleLoadingStage = 120;
+			} else if (Client.titleLoadingStage == 120) {
+				if (!FontName.archive10.tryLoadFileByNames("huffman", "")) {
+					Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
+					Login.Login_loadingPercent = 94;
+				} else {
+					Huffman var16 = new Huffman(FontName.archive10.takeFileByNames("huffman", ""));
+					class210.huffman = var16;
+					Login.Login_loadingText = "Loaded wordpack";
+					Login.Login_loadingPercent = 94;
+					Client.titleLoadingStage = 130;
+				}
+			} else if (Client.titleLoadingStage == 130) {
+				if (!WorldMapData_0.archive3.isFullyLoaded()) {
+					Login.Login_loadingText = "Loading interfaces - " + WorldMapData_0.archive3.loadPercent() * 4 / 5 + "%";
+					Login.Login_loadingPercent = 96;
+				} else if (!Message.archive12.isFullyLoaded()) {
+					Login.Login_loadingText = "Loading interfaces - " + (80 + Message.archive12.loadPercent() / 6) + "%";
+					Login.Login_loadingPercent = 96;
+				} else if (!TextureProvider.archive13.isFullyLoaded()) {
+					Login.Login_loadingText = "Loading interfaces - " + (96 + TextureProvider.archive13.loadPercent() / 50) + "%";
+					Login.Login_loadingPercent = 96;
+				} else {
+					Login.Login_loadingText = "Loaded interfaces";
+					Login.Login_loadingPercent = 98;
+					Client.titleLoadingStage = 140;
+				}
+			} else if (Client.titleLoadingStage == 140) {
+				Login.Login_loadingPercent = 100;
+				if (!UrlRequest.archive19.tryLoadGroupByName(WorldMapCacheName.field294.name)) {
+					Login.Login_loadingText = "Loading world map - " + UrlRequest.archive19.groupLoadPercentByName(WorldMapCacheName.field294.name) / 10 + "%";
+				} else {
+					if (GrandExchangeOfferUnitPriceComparator.worldMap == null) {
+						GrandExchangeOfferUnitPriceComparator.worldMap = new WorldMap();
+						GrandExchangeOfferUnitPriceComparator.worldMap.init(UrlRequest.archive19, WorldMapArea.archive18, WorldMapSection1.archive20, HealthBar.fontBold12, Client.fontsMap, class287.mapSceneSprites);
+					}
+
+					Login.Login_loadingText = "Loaded world map";
+					Client.titleLoadingStage = 150;
+				}
+			} else if (Client.titleLoadingStage == 150) {
+				WorldMapIcon_0.updateGameState(10);
+			}
+		}
+	}
+
+	@ObfuscatedName("hg")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		garbageValue = "-281939606"
+	)
+	@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;
+			}
+
 		}
 	}
 }
--- a/runescape-client/src/main/java/DefaultsGroup.java
+++ b/runescape-client/src/main/java/DefaultsGroup.java
@@ -4,29 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ka")
+@ObfuscatedName("ke")
@Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
-	static final DefaultsGroup field3794;
-	@ObfuscatedName("gs")
-	@ObfuscatedSignature(
-		signature = "[Lls;"
-	)
-	@Export("crossSprites")
-	static Sprite[] crossSprites;
-	@ObfuscatedName("j")
+	static final DefaultsGroup field3792;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 879655985
+		intValue = -1766167295
 	)
 	@Export("group")
 	final int group;

 	static {
-		field3794 = new DefaultsGroup(3);
+		field3792 = new DefaultsGroup(3);
 	}

 	DefaultsGroup(int var1) {
--- a/runescape-client/src/main/java/DemotingHashTable.java
+++ b/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("es")
+@ObfuscatedName("ez")
@Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lln;"
+		signature = "Llj;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljn;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lek;"
+		signature = "Leb;"
 	)
-	class146 field1944;
+	class146 field1931;

 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,7 +42,7 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -73,16 +73,16 @@ public final class DemotingHashTable {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Led;)V"
+		signature = "(Ley;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -94,7 +94,7 @@ public final class DemotingHashTable {

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@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) {
-					this.field1944.method3280(var5.get());
+				if (this.field1931 != null) {
+					this.field1931.method3299(var5.get());
 				}
 			}

@@ -125,7 +125,7 @@ public final class DemotingHashTable {
 		}
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@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("n")
+	@ObfuscatedName("u")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -5,38 +5,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("lk")
+@ObfuscatedName("lc")
@Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1435561195
+		intValue = -1989921303
 	)
-	int field3903;
+	int field3899;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 1264264203
+	)
+	int field3900;
 	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1717280991
+		intValue = -962266715
 	)
-	int field3901;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = 1506800737
-	)
-	int field3904;
+	int field3896;

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Llx;",
-		garbageValue = "-1719381077"
+		signature = "(I)Lla;",
+		garbageValue = "-2012824793"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (ByteArrayPool.field3708.startsWith("win")) {
+		if (UserComparator9.field1940.startsWith("win")) {
 			var1 = 1;
-		} else if (ByteArrayPool.field3708.startsWith("mac")) {
+		} else if (UserComparator9.field1940.startsWith("mac")) {
 			var1 = 2;
-		} else if (ByteArrayPool.field3708.startsWith("linux")) {
+		} else if (UserComparator9.field1940.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -134,11 +134,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}

-		this.method6147(var5);
+		this.method6218(var5);
 		Runtime.getRuntime();
 		int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
 		int var11;
-		if (this.field3903 > 3) {
+		if (this.field3899 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -152,127 +152,147 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3903, this.field3901, this.field3904, 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.field3899, this.field3900, this.field3896, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}

-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "28"
-	)
-	void method6147(String var1) {
-		if (var1.startsWith("1.")) {
-			this.method6148(var1);
-		} else {
-			this.method6145(var1);
-		}
-
-	}
-
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1225882646"
+		garbageValue = "1517223421"
 	)
-	void method6148(String var1) {
+	void method6218(String var1) {
+		if (var1.startsWith("1.")) {
+			this.method6216(var1);
+		} else {
+			this.method6219(var1);
+		}
+
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "943324304"
+	)
+	void method6216(String var1) {
 		String[] var2 = var1.split("\\.");

 		try {
-			this.field3903 = Integer.parseInt(var2[1]);
+			this.field3899 = Integer.parseInt(var2[1]);
 			var2 = var2[2].split("_");
-			this.field3901 = Integer.parseInt(var2[0]);
-			this.field3904 = Integer.parseInt(var2[1]);
+			this.field3900 = Integer.parseInt(var2[0]);
+			this.field3896 = Integer.parseInt(var2[1]);
 		} catch (Exception var4) {
 		}

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;S)V",
-		garbageValue = "-31875"
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-1994454967"
 	)
-	void method6145(String var1) {
+	void method6219(String var1) {
 		String[] var2 = var1.split("\\.");

 		try {
-			this.field3903 = Integer.parseInt(var2[0]);
-			this.field3901 = Integer.parseInt(var2[1]);
-			this.field3904 = Integer.parseInt(var2[2]);
+			this.field3899 = Integer.parseInt(var2[0]);
+			this.field3900 = Integer.parseInt(var2[1]);
+			this.field3896 = Integer.parseInt(var2[2]);
 		} catch (Exception var4) {
 		}

 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("fo")
 	@ObfuscatedSignature(
-		signature = "([BS)Lcr;",
-		garbageValue = "10322"
+		signature = "(IIIIZI)V",
+		garbageValue = "-608218598"
 	)
-	@Export("newScript")
-	static Script newScript(byte[] var0) {
-		Script var1 = new Script();
-		Buffer var2 = new Buffer(var0);
-		var2.offset = var2.array.length - 2;
-		int var3 = var2.readUnsignedShort();
-		int var4 = var2.array.length - 2 - var3 - 12;
-		var2.offset = var4;
-		int var5 = var2.readInt();
-		var1.localIntCount = var2.readUnsignedShort();
-		var1.localStringCount = var2.readUnsignedShort();
-		var1.intArgumentCount = var2.readUnsignedShort();
-		var1.stringArgumentCount = var2.readUnsignedShort();
-		int var6 = var2.readUnsignedByte();
-		int var7;
+	@Export("setViewportShape")
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) {
+			var2 = 1;
+		}
+
+		if (var3 < 1) {
+			var3 = 1;
+		}
+
+		int var5 = var3 - 334;
+		int var6;
+		if (var5 < 0) {
+			var6 = Client.field873;
+		} else if (var5 >= 100) {
+			var6 = Client.field752;
+		} else {
+			var6 = (Client.field752 - Client.field873) * var5 / 100 + Client.field873;
+		}
+
+		int var7 = var3 * var6 * 512 / (var2 * 334);
 		int var8;
-		if (var6 > 0) {
-			var1.switches = var1.newIterableNodeHashTable(var6);
-
-			for (var7 = 0; var7 < var6; ++var7) {
-				var8 = var2.readUnsignedShort();
-				int var9;
-				int var11;
-				if (var8 > 0) {
-					var11 = var8 - 1;
-					var11 |= var11 >>> 1;
-					var11 |= var11 >>> 2;
-					var11 |= var11 >>> 4;
-					var11 |= var11 >>> 8;
-					var11 |= var11 >>> 16;
-					int var10 = var11 + 1;
-					var9 = var10;
-				} else {
-					var9 = 1;
+		int var9;
+		short var18;
+		if (var7 < Client.field879) {
+			var18 = Client.field879;
+			var6 = var18 * var2 * 334 / (var3 * 512);
+			if (var6 > Client.field878) {
+				var6 = Client.field878;
+				var8 = var3 * var6 * 512 / (var18 * 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);
 				}

-				IterableNodeHashTable var13 = new IterableNodeHashTable(var9);
-				var1.switches[var7] = var13;
-
-				while (var8-- > 0) {
-					var11 = var2.readInt();
-					int var12 = var2.readInt();
-					var13.put(new IntegerNode(var12), (long)var11);
+				var0 += var9;
+				var2 -= var9 * 2;
+			}
+		} else if (var7 > Client.field717) {
+			var18 = Client.field717;
+			var6 = var18 * var2 * 334 / (var3 * 512);
+			if (var6 < Client.field877) {
+				var6 = Client.field877;
+				var8 = var18 * 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;
 			}
 		}

-		var2.offset = 0;
-		var2.readStringCp1252NullTerminatedOrNull();
-		var1.opcodes = new int[var5];
-		var1.intOperands = new int[var5];
-		var1.stringOperands = new String[var5];
+		Client.viewportZoom = var3 * var6 / 334;
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
+			int[] var17 = new int[9];

-		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) {
-			var8 = var2.readUnsignedShort();
-			if (var8 == 3) {
-				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
-			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
-				var1.intOperands[var7] = var2.readInt();
-			} else {
-				var1.intOperands[var7] = var2.readUnsignedByte();
+			for (var9 = 0; var9 < var17.length; ++var9) {
+				int var10 = var9 * 32 + 15 + 128;
+				int var11 = var10 * 3 + 600;
+				int var13 = Rasterizer3D.Rasterizer3D_sine[var10];
+				int var15 = var3 - 334;
+				if (var15 < 0) {
+					var15 = 0;
+				} else if (var15 > 100) {
+					var15 = 100;
+				}
+
+				int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight;
+				int var14 = var16 * var11 / 256;
+				var17[var9] = var14 * var13 >> 16;
 			}
+
+			Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334);
 		}

-		return var1;
+		Client.viewportOffsetX = var0;
+		Client.viewportOffsetY = var1;
+		Client.viewportWidth = var2;
+		Client.viewportHeight = var3;
 	}
 }
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -12,40 +12,40 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("aw")
@Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 305940879
+		intValue = 1378130065
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("byteSamples")
 	byte[] byteSamples;

 	DevicePcmPlayer() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "1"
+		signature = "(I)V",
+		garbageValue = "1989780823"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)PcmPlayer.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
 		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "1939802329"
+		signature = "(IB)V",
+		garbageValue = "91"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
@@ -78,17 +78,17 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "428413683"
+		garbageValue = "-1120986508"
 	)
 	@Export("position")
 	protected int position() {
 		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
@@ -109,10 +109,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "37766209"
+		garbageValue = "-1450874669"
 	)
 	@Export("close")
 	protected void close() {
@@ -123,10 +123,10 @@ public class DevicePcmPlayer extends PcmPlayer {

 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "645078569"
+		garbageValue = "-93486639"
 	)
 	@Export("discard")
 	protected void discard() {
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -1,56 +1,174 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("ad")
+@ObfuscatedName("ac")
@Implements("DevicePcmPlayerProvider")
 public class DevicePcmPlayerProvider implements PcmPlayerProvider {
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "[Lmw;"
+	)
+	@Export("JagexCache_idxFiles")
+	public static BufferedFile[] JagexCache_idxFiles;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		signature = "Lkz;"
+	)
+	@Export("NetCache_reference")
+	static Buffer NetCache_reference;
+	@ObfuscatedName("ay")
+	@ObfuscatedSignature(
+		signature = "Llf;"
+	)
+	@Export("rasterProvider")
+	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("iz")
+	@ObfuscatedGetter(
+		intValue = -102001369
+	)
+	@Export("selectedItemId")
+	static int selectedItemId;
+
 	DevicePcmPlayerProvider() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(S)Ldd;",
-		garbageValue = "-22145"
+		signature = "(I)Ldh;",
+		garbageValue = "-131796443"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
-		garbageValue = "1"
+		signature = "(IIB)I",
+		garbageValue = "24"
 	)
-	static boolean method794(int var0, int var1) {
-		return var0 != 4 || var1 < 8;
+	static final int method811(int var0, int var1) {
+		int var2 = method805(var0 - 1, var1 - 1) + method805(var0 + 1, var1 - 1) + method805(var0 - 1, var1 + 1) + method805(1 + var0, 1 + var1);
+		int var3 = method805(var0 - 1, var1) + method805(1 + var0, var1) + method805(var0, var1 - 1) + method805(var0, 1 + var1);
+		int var4 = method805(var0, var1);
+		return var2 / 16 + var3 / 8 + var4 / 4;
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "895453465"
+		signature = "(IIB)I",
+		garbageValue = "118"
 	)
-	public static void method793(int var0) {
-		class197.field2378 = 1;
-		WorldMapDecoration.musicTrackArchive = null;
-		class197.musicTrackGroupId = -1;
-		class197.musicTrackFileId = -1;
-		WorldMapSprite.field222 = 0;
-		Varcs.musicTrackBoolean = false;
-		class16.field98 = var0;
+	static final int method805(int var0, int var1) {
+		int var2 = var0 + var1 * 57;
+		var2 ^= var2 << 13;
+		int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE;
+		return var3 >> 19 & 255;
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		signature = "(I)Lbl;",
-		garbageValue = "-1981262323"
+		signature = "(ILcu;ZB)I",
+		garbageValue = "13"
 	)
-	@Export("worldListStart")
-	static World worldListStart() {
-		World.World_listCount = 0;
-		return GrandExchangeOfferAgeComparator.getNextWorldListWorld();
+	static int method809(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		int var6;
+		if (var0 == ScriptOpcodes.ENUM_STRING) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			EnumDefinition var5 = NetFileRequest.getEnum(var3);
+			if (var5.outputType != 's') {
+			}
+
+			for (var6 = 0; var6 < var5.outputCount; ++var6) {
+				if (var4 == var5.keys[var6]) {
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.strVals[var6];
+					var5 = null;
+					break;
+				}
+			}
+
+			if (var5 != null) {
+				Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.defaultStr;
+			}
+
+			return 1;
+		} else if (var0 != ScriptOpcodes.ENUM) {
+			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) {
+				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+				EnumDefinition var10 = NetFileRequest.getEnum(var3);
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var10.size();
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			class160.Interpreter_intStackSize -= 4;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			int var9 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
+			var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
+			EnumDefinition var7 = NetFileRequest.getEnum(var9);
+			if (var3 == var7.inputType && var4 == var7.outputType) {
+				for (int var8 = 0; var8 < var7.outputCount; ++var8) {
+					if (var6 == var7.keys[var8]) {
+						if (var4 == 115) {
+							Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var7.strVals[var8];
+						} else {
+							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.intVals[var8];
+						}
+
+						var7 = null;
+						break;
+					}
+				}
+
+				if (var7 != null) {
+					if (var4 == 115) {
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var7.defaultStr;
+					} else {
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.defaultInt;
+					}
+				}
+
+				return 1;
+			} else {
+				if (var4 == 115) {
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "null";
+				} else {
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			}
+		}
+	}
+
+	@ObfuscatedName("jc")
+	@ObfuscatedSignature(
+		signature = "(IB)V",
+		garbageValue = "105"
+	)
+	@Export("Widget_resetModelFrames")
+	static final void Widget_resetModelFrames(int var0) {
+		if (TaskHandler.loadInterface(var0)) {
+			Widget[] var1 = class289.Widget_interfaceComponents[var0];
+
+			for (int var2 = 0; var2 < var1.length; ++var2) {
+				Widget var3 = var1[var2];
+				if (var3 != null) {
+					var3.modelFrame = 0;
+					var3.modelFrameCycle = 0;
+				}
+			}
+
+		}
 	}
 }
--- a/runescape-client/src/main/java/DirectByteArrayCopier.java
+++ b/runescape-client/src/main/java/DirectByteArrayCopier.java
@@ -4,20 +4,20 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("gb")
+@ObfuscatedName("gx")
@Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;

 	DirectByteArrayCopier() {
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)[B",
-		garbageValue = "-1040345200"
+		signature = "(B)[B",
+		garbageValue = "49"
 	)
 	@Export("get")
 	byte[] get() {
@@ -27,10 +27,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "38240743"
+		garbageValue = "-1981176877"
 	)
 	@Export("set")
 	void set(byte[] var1) {
@@ -39,23 +39,8 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		this.directBuffer.put(var1);
 	}

-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "2110102488"
-	)
-	@Export("addGameMessage")
-	static void addGameMessage(int var0, String var1, String var2) {
-		MilliClock.addChatMessage(var0, var1, var2, (String)null);
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "470994563"
-	)
-	@Export("isWorldMapEvent")
-	public static boolean isWorldMapEvent(int var0) {
-		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17;
+	@ObfuscatedName("d")
+	static final void method3932(long var0) {
+		ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0;
 	}
 }
--- a/runescape-client/src/main/java/DirectWrapper.java
+++ b/runescape-client/src/main/java/DirectWrapper.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;

-@ObfuscatedName("et")
+@ObfuscatedName("ei")
@Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("obj")
 	Object obj;

@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("isSoft")
 	boolean isSoft() {
 		return false;
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("fe")
+@ObfuscatedName("fv")
@Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cu")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cd")
 	@ObfuscatedSignature(
-		signature = "Lfe;"
+		signature = "Lfv;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("cs")
 	@ObfuscatedSignature(
-		signature = "Lfe;"
+		signature = "Lfv;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;

-	@ObfuscatedName("cl")
+	@ObfuscatedName("cx")
 	@Export("removeDual")
 	public void removeDual() {
 		if (this.nextDual != null) {
--- a/runescape-client/src/main/java/DualNodeDeque.java
+++ b/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("ih")
+@ObfuscatedName("ig")
@Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lfe;"
+		signature = "Lfv;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lfe;)V"
+		signature = "(Lfv;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lfe;)V"
+		signature = "(Lfv;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "()Lfe;"
+		signature = "()Lfv;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -4,74 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("cl")
+@ObfuscatedName("cd")
@Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("at")
-	static String field1268;
-	@ObfuscatedName("ha")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -775717141
-	)
-	@Export("oculusOrbFocalPointX")
-	static int oculusOrbFocalPointX;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -760390045
+		intValue = -440317767
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -980932459
+		intValue = 1457716031
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -400059677
+		intValue = 2004235481
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1290123367
+		intValue = 1247808451
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -508815789
+		intValue = 910065863
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -490638225
+		intValue = 439709923
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lij;"
+		signature = "Liw;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 156262843
+		intValue = 1565823045
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1843823299
+		intValue = -1402940691
 	)
 	@Export("cycleStart")
 	int cycleStart;

 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLen;)V"
+		signature = "(IIIIIIIZLel;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -81,12 +73,12 @@ public class DynamicObject extends Entity {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = Widget.SequenceDefinition_get(var7);
+			this.sequenceDefinition = class83.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field3492 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field3502 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
-				if (this.sequenceDefinition == var10.sequenceDefinition) {
+				if (var10.sequenceDefinition == this.sequenceDefinition) {
 					this.frame = var10.frame;
 					this.cycleStart = var10.cycleStart;
 					return;
@@ -101,10 +93,10 @@ public class DynamicObject extends Entity {

 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(I)Ldo;",
-		garbageValue = "-419920513"
+		signature = "(B)Ldr;",
+		garbageValue = "-35"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -134,7 +126,7 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}

-		ObjectDefinition var12 = class215.getObjectDefinition(this.id);
+		ObjectDefinition var12 = WallDecoration.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -157,109 +149,82 @@ 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[var5][var7] + var8[var4][var6] + var8[var5][var6] + var8[var4][var7] >> 2;
 			int var10 = (this.x << 7) + (var2 << 6);
 			int var11 = (this.y << 7) + (var3 << 6);
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
 		}
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lky;Lln;I)Lln;",
-		garbageValue = "796089456"
+		signature = "(Ljava/lang/CharSequence;I)Z",
+		garbageValue = "1791385097"
 	)
-	@Export("readStringIntParameters")
-	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
-		int var2 = var0.readUnsignedByte();
-		int var3;
-		if (var1 == null) {
-			int var4 = var2 - 1;
-			var4 |= var4 >>> 1;
-			var4 |= var4 >>> 2;
-			var4 |= var4 >>> 4;
-			var4 |= var4 >>> 8;
-			var4 |= var4 >>> 16;
-			var3 = var4 + 1;
-			var1 = new IterableNodeHashTable(var3);
-		}
+	@Export("isNumber")
+	public static boolean isNumber(CharSequence var0) {
+		boolean var2 = false;
+		boolean var3 = false;
+		int var4 = 0;
+		int var5 = var0.length();
+		int var6 = 0;

-		for (var3 = 0; var3 < var2; ++var3) {
-			boolean var7 = var0.readUnsignedByte() == 1;
-			int var5 = var0.readMedium();
-			Object var6;
-			if (var7) {
-				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
-			} else {
-				var6 = new IntegerNode(var0.readInt());
+		boolean var1;
+		while (true) {
+			if (var6 >= var5) {
+				var1 = var3;
+				break;
 			}

-			var1.put((Node)var6, (long)var5);
+			label84: {
+				char var7 = var0.charAt(var6);
+				if (var6 == 0) {
+					if (var7 == '-') {
+						var2 = true;
+						break label84;
+					}
+
+					if (var7 == '+') {
+						break label84;
+					}
+				}
+
+				int var9;
+				if (var7 >= '0' && var7 <= '9') {
+					var9 = var7 - '0';
+				} else if (var7 >= 'A' && var7 <= 'Z') {
+					var9 = var7 - '7';
+				} else {
+					if (var7 < 'a' || var7 > 'z') {
+						var1 = false;
+						break;
+					}
+
+					var9 = var7 - 'W';
+				}
+
+				if (var9 >= 10) {
+					var1 = false;
+					break;
+				}
+
+				if (var2) {
+					var9 = -var9;
+				}
+
+				int var8 = var9 + var4 * 10;
+				if (var4 != var8 / 10) {
+					var1 = false;
+					break;
+				}
+
+				var4 = var8;
+				var3 = true;
+			}
+
+			++var6;
 		}

 		return var1;
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-513328656"
-	)
-	static void method2153() {
-		if (Login.field1146) {
-			Login.titleboxSprite = null;
-			Login.titlebuttonSprite = null;
-			ItemDefinition.runesSprite = null;
-			Login.leftTitleSprite = null;
-			Login.rightTitleSprite = null;
-			class51.logoSprite = null;
-			BoundaryObject.title_muteSprite = null;
-			Login.options_buttons_0Sprite = null;
-			Login.options_buttons_2Sprite = null;
-			SoundCache.worldSelectBackSprites = null;
-			class1.worldSelectFlagSprites = null;
-			Decimator.worldSelectArrows = null;
-			NetFileRequest.worldSelectStars = null;
-			class195.field2368 = null;
-			Bounds.loginScreenRunesAnimation.method1731();
-			DevicePcmPlayerProvider.method793(2);
-			NPC.method1977(true);
-			Login.field1146 = false;
-		}
-	}
-
-	@ObfuscatedName("jz")
-	@ObfuscatedSignature(
-		signature = "(Lhp;Liu;IIZB)V",
-		garbageValue = "41"
-	)
-	@Export("addWidgetItemMenuItem")
-	static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) {
-		String[] var5 = var1.inventoryActions;
-		byte var6 = -1;
-		String var7 = null;
-		if (var5 != null && var5[var3] != null) {
-			if (var3 == 0) {
-				var6 = 33;
-			} else if (var3 == 1) {
-				var6 = 34;
-			} else if (var3 == 2) {
-				var6 = 35;
-			} else if (var3 == 3) {
-				var6 = 36;
-			} else {
-				var6 = 37;
-			}
-
-			var7 = var5[var3];
-		} else if (var3 == 4) {
-			var6 = 37;
-			var7 = "Drop";
-		}
-
-		if (var6 != -1 && var7 != null) {
-			NetCache.insertMenuItem(var7, class16.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4);
-		}
-
-	}
 }
--- a/runescape-client/src/main/java/Entity.java
+++ b/runescape-client/src/main/java/Entity.java
@@ -1,16 +1,23 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("en")
+@ObfuscatedName("el")
@Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("cn")
+	@ObfuscatedName("jn")
+	@ObfuscatedSignature(
+		signature = "Lhy;"
+	)
+	static Widget field1835;
+	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = 747190067
+		intValue = -160272347
 	)
 	@Export("height")
 	public int height;
@@ -19,10 +26,10 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(I)Ldo;",
-		garbageValue = "-419920513"
+		signature = "(B)Ldr;",
+		garbageValue = "-35"
 	)
 	@Export("getModel")
 	protected Model getModel() {
@@ -40,62 +47,227 @@ public abstract class Entity extends DualNode {

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "([BZB)Ljava/lang/Object;",
-		garbageValue = "42"
+		signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
+		garbageValue = "1018244137"
 	)
-	public static Object method3209(byte[] var0, boolean var1) {
-		if (var0 == null) {
-			return null;
-		} else if (var0.length > 136) {
-			DirectByteArrayCopier var2 = new DirectByteArrayCopier();
-			var2.set(var0);
-			return var2;
-		} else {
-			return var0;
-		}
-	}
+	@Export("getCacheDir")
+	static File getCacheDir(String var0, String var1, int var2) {
+		String var3 = var2 == 0 ? "" : "" + var2;
+		JagexCache.JagexCache_locationFile = new File(Message.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat");
+		String var4 = null;
+		String var5 = null;
+		boolean var6 = false;
+		int var11;
+		File var26;
+		if (JagexCache.JagexCache_locationFile.exists()) {
+			try {
+				AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);

-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(DDII)[D",
-		garbageValue = "-361048020"
-	)
-	public static double[] method3211(double var0, double var2, int var4) {
-		int var5 = var4 * 2 + 1;
-		double[] var6 = new double[var5];
-		int var7 = -var4;
+				Buffer var8;
+				int var9;
+				for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) {
+					var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset);
+					if (var9 == -1) {
+						throw new IOException();
+					}
+				}

-		for (int var8 = 0; var7 <= var4; ++var8) {
-			var6[var8] = class195.method3623((double)var7, var0, var2);
-			++var7;
+				var8.offset = 0;
+				var9 = var8.readUnsignedByte();
+				if (var9 < 1 || var9 > 3) {
+					throw new IOException("" + var9);
+				}
+
+				int var10 = 0;
+				if (var9 > 1) {
+					var10 = var8.readUnsignedByte();
+				}
+
+				if (var9 <= 2) {
+					var4 = var8.readStringCp1252NullCircumfixed();
+					if (var10 == 1) {
+						var5 = var8.readStringCp1252NullCircumfixed();
+					}
+				} else {
+					var4 = var8.readCESU8();
+					if (var10 == 1) {
+						var5 = var8.readCESU8();
+					}
+				}
+
+				var7.close();
+			} catch (IOException var24) {
+				var24.printStackTrace();
+			}
+
+			if (var4 != null) {
+				var26 = new File(var4);
+				if (!var26.exists()) {
+					var4 = null;
+				}
+			}
+
+			if (var4 != null) {
+				var26 = new File(var4, "test.dat");
+
+				boolean var27;
+				try {
+					RandomAccessFile var15 = new RandomAccessFile(var26, "rw");
+					var11 = var15.read();
+					var15.seek(0L);
+					var15.write(var11);
+					var15.seek(0L);
+					var15.close();
+					var26.delete();
+					var27 = true;
+				} catch (Exception var22) {
+					var27 = false;
+				}
+
+				if (!var27) {
+					var4 = null;
+				}
+			}
 		}

-		return var6;
-	}
+		if (var4 == null && var2 == 0) {
+			label139:
+			for (int var16 = 0; var16 < NetFileRequest.field3096.length; ++var16) {
+				for (int var17 = 0; var17 < GrandExchangeOfferWorldComparator.field30.length; ++var17) {
+					File var18 = new File(GrandExchangeOfferWorldComparator.field30[var17] + NetFileRequest.field3096[var16] + File.separatorChar + var0 + File.separatorChar);
+					if (var18.exists()) {
+						File var19 = new File(var18, "test.dat");

-	@ObfuscatedName("ak")
-	@ObfuscatedSignature(
-		signature = "(ILcr;ZI)I",
-		garbageValue = "-1173626349"
-	)
-	static int method3210(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.LOGOUT) {
-			Client.logoutTimer = 250;
-			return 1;
-		} else {
-			return 2;
+						boolean var28;
+						try {
+							RandomAccessFile var12 = new RandomAccessFile(var19, "rw");
+							int var13 = var12.read();
+							var12.seek(0L);
+							var12.write(var13);
+							var12.seek(0L);
+							var12.close();
+							var19.delete();
+							var28 = true;
+						} catch (Exception var21) {
+							var28 = false;
+						}
+
+						if (var28) {
+							var4 = var18.toString();
+							var6 = true;
+							break label139;
+						}
+					}
+				}
+			}
 		}
+
+		if (var4 == null) {
+			var4 = Message.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar;
+			var6 = true;
+		}
+
+		if (var5 != null) {
+			File var25 = new File(var5);
+			var26 = new File(var4);
+
+			try {
+				File[] var31 = var25.listFiles();
+				File[] var30 = var31;
+
+				for (var11 = 0; var11 < var30.length; ++var11) {
+					File var29 = var30[var11];
+					File var20 = new File(var26, var29.getName());
+					boolean var14 = var29.renameTo(var20);
+					if (!var14) {
+						throw new IOException();
+					}
+				}
+			} catch (Exception var23) {
+				var23.printStackTrace();
+			}
+
+			var6 = true;
+		}
+
+		if (var6) {
+			WorldMapManager.method611(new File(var4), (File)null);
+		}
+
+		return new File(var4);
 	}

-	@ObfuscatedName("gd")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Lbu;II)V",
-		garbageValue = "558636836"
+		signature = "(IIII)I",
+		garbageValue = "-284240639"
 	)
-	@Export("getActorScreenLocation")
-	static final void getActorScreenLocation(Actor var0, int var1) {
-		WorldMapAreaData.worldToScreen(var0.x, var0.y, var1);
+	@Export("hslToRgb")
+	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;
+	}
+
+	@ObfuscatedName("er")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-16"
+	)
+	static void method3228() {
+		Client.packetWriter.clearBuffer();
+		Client.packetWriter.packetBuffer.offset = 0;
+		Client.packetWriter.serverPacket = null;
+		Client.packetWriter.field1274 = null;
+		Client.packetWriter.field1286 = null;
+		Client.packetWriter.field1287 = null;
+		Client.packetWriter.serverPacketLength = 0;
+		Client.packetWriter.field1283 = 0;
+		Client.rebootTimer = 0;
+		Client.menuOptionsCount = 0;
+		Client.isMenuOpen = false;
+		Client.minimapState = 0;
+		Client.destinationX = 0;
+
+		int var0;
+		for (var0 = 0; var0 < 2048; ++var0) {
+			Client.players[var0] = null;
+		}
+
+		Varps.localPlayer = null;
+
+		for (var0 = 0; var0 < Client.npcs.length; ++var0) {
+			NPC var1 = Client.npcs[var0];
+			if (var1 != null) {
+				var1.targetIndex = -1;
+				var1.false0 = false;
+			}
+		}
+
+		class286.method5221();
+		WorldMapIcon_0.updateGameState(30);
+
+		for (var0 = 0; var0 < 100; ++var0) {
+			Client.field827[var0] = true;
+		}
+
+		MouseRecorder.method1145();
 	}
 }
--- a/runescape-client/src/main/java/EnumDefinition.java
+++ b/runescape-client/src/main/java/EnumDefinition.java
--- a/runescape-client/src/main/java/Enumerated.java
+++ b/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("gn")
+@ObfuscatedName("gk")
@Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-32"
+		signature = "(I)I",
+		garbageValue = "-1410702910"
 	)
 	@Export("rsOrdinal")
 	int rsOrdinal();
--- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java
+++ b/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("ep")
+@ObfuscatedName("et")
@Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lfe;"
+		signature = "Lfv;"
 	)
-	DualNode field1935;
-	@ObfuscatedName("j")
+	DualNode field1923;
+	@ObfuscatedName("x")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lln;"
+		signature = "Llj;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljn;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;

 	public EvictingDualNodeHashTable(int var1) {
-		this.field1935 = new DualNode();
+		this.field1923 = new DualNode();
 		this.deque = new IterableDualNodeQueue();
 		this.capacity = var1;
 		this.remainingCapacity = var1;
@@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable {
 		this.hashTable = new IterableNodeHashTable(var2);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(J)Lfe;"
+		signature = "(J)Lfv;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {

 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lfe;J)V"
+		signature = "(Lfv;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.field1935) {
+			if (var4 == this.field1923) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1935 = new DualNode();
+		this.field1923 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -2,105 +2,35 @@ 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("ei")
+@ObfuscatedName("em")
@Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("x")
-	@Export("ByteArrayPool_arrays")
-	public static byte[][][] ByteArrayPool_arrays;
-	@ObfuscatedName("s")
+	@ObfuscatedName("kk")
 	@ObfuscatedGetter(
-		intValue = 672881507
+		intValue = -2016617893
+	)
+	@Export("menuHeight")
+	static int menuHeight;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 153550735
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1754026933
+		intValue = -1428823539
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -2141931209
+		intValue = 1573119105
 	)
 	@Export("z")
 	int z;

 	FaceNormal() {
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(CB)Z",
-		garbageValue = "-36"
-	)
-	static final boolean method3222(char var0) {
-		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
-		garbageValue = "1"
-	)
-	@Export("base37Decode")
-	public static String base37Decode(CharSequence var0) {
-		long var3 = 0L;
-		int var5 = var0.length();
-
-		for (int var6 = 0; var6 < var5; ++var6) {
-			var3 *= 37L;
-			char var7 = var0.charAt(var6);
-			if (var7 >= 'A' && var7 <= 'Z') {
-				var3 += (long)(var7 + 1 - 65);
-			} else if (var7 >= 'a' && var7 <= 'z') {
-				var3 += (long)(var7 + 1 - 97);
-			} else if (var7 >= '0' && var7 <= '9') {
-				var3 += (long)(var7 + 27 - 48);
-			}
-
-			if (var3 >= 177917621779460413L) {
-				break;
-			}
-		}
-
-		while (0L == var3 % 37L && var3 != 0L) {
-			var3 /= 37L;
-		}
-
-		String var8 = class266.base37DecodeLong(var3);
-		if (var8 == null) {
-			var8 = "";
-		}
-
-		return var8;
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(IB)I",
-		garbageValue = "105"
-	)
-	@Export("Messages_getNextChatID")
-	static int Messages_getNextChatID(int var0) {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-		if (var1 == null) {
-			return -1;
-		} else {
-			return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count;
-		}
-	}
-
-	@ObfuscatedName("kb")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1280047556"
-	)
-	static final void method3221() {
-		Client.field817 = Client.cycleCntr;
-		class13.ClanChat_inClanChat = true;
-	}
 }
--- a/runescape-client/src/main/java/FileSystem.java
+++ b/runescape-client/src/main/java/FileSystem.java
@@ -1,81 +1,69 @@
-import java.io.File;
 import java.util.Hashtable;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("fj")
+@ObfuscatedName("fi")
@Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("s")
+	@ObfuscatedName("qd")
+	@ObfuscatedGetter(
+		intValue = 1877422611
+	)
+	static int field2027;
+	@ObfuscatedName("c")
 	@Export("FileSystem_hasPermissions")
-	public static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("j")
-	@Export("FileSystem_cacheDir")
-	public static File FileSystem_cacheDir;
-	@ObfuscatedName("i")
+	static boolean FileSystem_hasPermissions;
+	@ObfuscatedName("t")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "[Llt;"
+	)
+	@Export("title_muteSprite")
+	static IndexedSprite[] title_muteSprite;
+	@ObfuscatedName("bw")
+	@ObfuscatedSignature(
+		signature = "[Llt;"
+	)
+	@Export("worldSelectArrows")
+	static IndexedSprite[] worldSelectArrows;
+	@ObfuscatedName("kl")
+	@ObfuscatedGetter(
+		intValue = -841195075
+	)
+	@Export("menuX")
+	static int menuX;

 	static {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(II)Lip;",
-		garbageValue = "-760710815"
+		signature = "(I)[Llt;",
+		garbageValue = "584570356"
 	)
-	public static VarcInt method3447(int var0) {
-		VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0);
-			var1 = new VarcInt();
-			if (var2 != null) {
-				var1.method4314(new Buffer(var2));
-			}
+	public static IndexedSprite[] method3489() {
+		IndexedSprite[] var0 = new IndexedSprite[class325.SpriteBuffer_spriteCount];

-			VarcInt.VarcInt_cached.put(var1, (long)var0);
-			return var1;
+		for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) {
+			IndexedSprite var2 = var0[var1] = new IndexedSprite();
+			var2.width = class325.SpriteBuffer_spriteWidth;
+			var2.height = class325.SpriteBuffer_spriteHeight;
+			var2.xOffset = class325.SpriteBuffer_xOffsets[var1];
+			var2.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[var1];
+			var2.subWidth = class325.SpriteBuffer_spriteWidths[var1];
+			var2.subHeight = SoundSystem.SpriteBuffer_spriteHeights[var1];
+			var2.palette = class325.SpriteBuffer_spritePalette;
+			var2.pixels = InvDefinition.SpriteBuffer_pixels[var1];
 		}
-	}

-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "(IIB)Lbi;",
-		garbageValue = "17"
-	)
-	@Export("Messages_getByChannelAndID")
-	static Message Messages_getByChannelAndID(int var0, int var1) {
-		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
-		return var2.getMessage(var1);
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;III)Lkb;",
-		garbageValue = "1068587353"
-	)
-	@Export("SpriteBuffer_getFont")
-	public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
-		if (!World.SpriteBuffer_bufferFile(var0, var2, var3)) {
-			return null;
-		} else {
-			byte[] var5 = var1.takeFile(var2, var3);
-			Font var4;
-			if (var5 == null) {
-				var4 = null;
-			} else {
-				Font var6 = new Font(var5, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, WorldMapSection1.SpriteBuffer_pixels);
-				UserComparator7.SpriteBuffer_clear();
-				var4 = var6;
-			}
-
-			return var4;
-		}
+		class192.SpriteBuffer_clear();
+		return var0;
 	}
 }
--- a/runescape-client/src/main/java/FillMode.java
+++ b/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("lb")
+@ObfuscatedName("lq")
@Implements("FillMode")
 public enum FillMode implements Enumerated {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llq;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llq;"
 	)
-	field3858(1, 1),
-	@ObfuscatedName("i")
+	field3855(1, 1),
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llq;"
 	)
-	field3860(2, 2);
+	field3852(2, 2);

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -375665689
+		intValue = -494470033
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -839626013
+		intValue = -1639084691
 	)
 	@Export("id")
 	final int id;
@@ -42,13 +42,32 @@ public enum FillMode implements Enumerated {
 		this.id = var4;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-32"
+		signature = "(I)I",
+		garbageValue = "-1410702910"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "(Lhz;IIS)Lli;",
+		garbageValue = "-25317"
+	)
+	@Export("SpriteBuffer_getSprite")
+	public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+		byte[] var4 = var0.takeFile(var1, var2);
+		boolean var3;
+		if (var4 == null) {
+			var3 = false;
+		} else {
+			GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var4);
+			var3 = true;
+		}
+
+		return !var3 ? null : ChatChannel.method2218();
+	}
 }
--- a/runescape-client/src/main/java/FloorDecoration.java
+++ b/runescape-client/src/main/java/FloorDecoration.java
@@ -1,58 +1,50 @@
-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("dy")
+@ObfuscatedName("db")
@Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("x")
+	@ObfuscatedName("fg")
 	@ObfuscatedGetter(
-		intValue = -513074151
+		intValue = 2143903215
 	)
-	@Export("PcmPlayer_count")
-	static int PcmPlayer_count;
-	@ObfuscatedName("ec")
+	static int field1585;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1042709879
-	)
-	@Export("port2")
-	static int port2;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 577791457
+		intValue = -1477946129
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2080109751
-	)
-	@Export("x")
-	int x;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 748443287
+		intValue = -662619385
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -1897979537
+	)
+	@Export("x")
+	int x;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Len;"
+		signature = "Lel;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = 6356128824356996537L
+		longValue = -6178260684418985297L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1037477129
+		intValue = 944766785
 	)
 	@Export("flags")
 	int flags;
@@ -60,85 +52,30 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	}

-	@ObfuscatedName("er")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-1136881308"
+		signature = "(IIIII)V",
+		garbageValue = "423054360"
 	)
-	@Export("updateGameState")
-	static void updateGameState(int var0) {
-		if (var0 != Client.gameState) {
-			if (Client.gameState == 0) {
-				WorldMapID.client.method891();
-			}
+	static final void method2813(int var0, int var1, int var2, int var3) {
+		for (int var4 = var1; var4 <= var3 + var1; ++var4) {
+			for (int var5 = var0; var5 <= var0 + var2; ++var5) {
+				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
+					Tiles.field473[0][var5][var4] = 127;
+					if (var0 == var5 && var5 > 0) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
+					}

-			if (var0 == 20 || var0 == 40 || var0 == 45) {
-				Client.loginState = 0;
-				Client.field658 = 0;
-				Client.field659 = 0;
-				Client.timer.method4899(var0);
-				if (var0 != 20) {
-					WorldMapArea.method358(false);
-				}
-			}
+					if (var5 == var0 + var2 && var5 < 103) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
+					}

-			if (var0 != 20 && var0 != 40 && Bounds.field3845 != null) {
-				Bounds.field3845.close();
-				Bounds.field3845 = null;
-			}
+					if (var4 == var1 && var4 > 0) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
+					}

-			if (Client.gameState == 25) {
-				Client.field719 = 0;
-				Client.field676 = 0;
-				Client.field886 = 1;
-				Client.field678 = 0;
-				Client.field718 = 1;
-			}
-
-			if (var0 != 5 && var0 != 10) {
-				if (var0 == 20) {
-					BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, Client.gameState == 11 ? 4 : 0);
-				} else if (var0 == 11) {
-					BoundaryObject.method3213(GameObject.archive10, class2.archive8, false, 4);
-				} else {
-					DynamicObject.method2153();
-				}
-			} else {
-				BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, 0);
-			}
-
-			Client.gameState = var0;
-		}
-	}
-
-	@ObfuscatedName("hd")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1412444391"
-	)
-	static final void method2788() {
-		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
-			if (var0.hitpoints > 0) {
-				--var0.hitpoints;
-			}
-
-			if (var0.hitpoints == 0) {
-				if (var0.objectId < 0 || WorldMapSprite.method404(var0.objectId, var0.field903)) {
-					Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field907, var0.field903);
-					var0.remove();
-				}
-			} else {
-				if (var0.delay > 0) {
-					--var0.delay;
-				}
-
-				if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || WorldMapSprite.method404(var0.id, var0.field911))) {
-					Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field911);
-					var0.delay = -1;
-					if (var0.id == var0.objectId && var0.objectId == -1) {
-						var0.remove();
-					} else if (var0.id == var0.objectId && var0.orientation == var0.field907 && var0.field903 == var0.field911) {
-						var0.remove();
+					if (var3 + var1 == var4 && var4 < 103) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
 					}
 				}
 			}
@@ -146,49 +83,72 @@ public final class FloorDecoration {

 	}

-	@ObfuscatedName("hq")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "507499403"
+		signature = "(B)V",
+		garbageValue = "3"
 	)
-	static final void method2786(int var0, int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
-			if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
-				Client.field703[var4] = true;
+	public static void method2811() {
+		try {
+			JagexCache.JagexCache_dat2File.close();
+
+			for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) {
+				DevicePcmPlayerProvider.JagexCache_idxFiles[var0].close();
 			}
+
+			JagexCache.JagexCache_idx255File.close();
+			JagexCache.JagexCache_randomDat.close();
+		} catch (Exception var2) {
 		}

 	}

-	@ObfuscatedName("kh")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(Lky;I)V",
-		garbageValue = "183516662"
+		signature = "(IIB)I",
+		garbageValue = "119"
 	)
-	static void method2787(Buffer var0) {
-		if (Client.randomDatData != null) {
-			var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
-		} else {
-			byte[] var2 = new byte[24];
-
-			try {
-				JagexCache.JagexCache_randomDat.seek(0L);
-				JagexCache.JagexCache_randomDat.readFully(var2);
-
-				int var3;
-				for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) {
-				}
-
-				if (var3 >= 24) {
-					throw new IOException();
-				}
-			} catch (Exception var6) {
-				for (int var4 = 0; var4 < 24; ++var4) {
-					var2[var4] = -1;
-				}
+	static final int method2812(int var0, int var1) {
+		if (var0 == -2) {
+			return 12345678;
+		} else if (var0 == -1) {
+			if (var1 < 2) {
+				var1 = 2;
+			} else if (var1 > 126) {
+				var1 = 126;
 			}

-			var0.writeBytes(var2, 0, var2.length);
+			return var1;
+		} else {
+			var1 = (var0 & 127) * var1 / 128;
+			if (var1 < 2) {
+				var1 = 2;
+			} else if (var1 > 126) {
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1;
+		}
+	}
+
+	@ObfuscatedName("hx")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "932065265"
+	)
+	@Export("Widget_runOnTargetLeave")
+	static void Widget_runOnTargetLeave() {
+		if (Client.isSpellSelected) {
+			Widget var0 = class49.getWidgetChild(class83.field1138, Client.field687);
+			if (var0 != null && var0.onTargetLeave != null) {
+				ScriptEvent var1 = new ScriptEvent();
+				var1.widget = var0;
+				var1.args = var0.onTargetLeave;
+				SecureRandomFuture.runScriptEvent(var1);
+			}
+
+			Client.isSpellSelected = false;
+			WorldMapID.invalidateWidget(var0);
 		}
 	}
 }
--- a/runescape-client/src/main/java/FloorOverlayDefinition.java
+++ b/runescape-client/src/main/java/FloorOverlayDefinition.java
@@ -4,75 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("iv")
+@ObfuscatedName("ip")
@Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Let;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1186285675
+		intValue = 54951813
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1987325665
+		intValue = 1779680487
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -375374105
+		intValue = -707302109
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1926193945
+		intValue = 1456521303
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1588177313
+		intValue = 688606529
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1646509357
+		intValue = -870998143
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1281479925
+		intValue = -1714187585
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1612990267
+		intValue = -1373753821
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -520563245
+		intValue = -1682451449
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -88,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-32"
+		garbageValue = "-55"
 	)
 	@Export("postDecode")
 	public void postDecode() {
@@ -105,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;II)V",
-		garbageValue = "-1938903864"
+		signature = "(Lkz;II)V",
+		garbageValue = "1739304063"
 	)
 	@Export("decode")
 	public void decode(Buffer var1, int var2) {
@@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Lky;III)V",
-		garbageValue = "-1583990473"
+		signature = "(Lkz;III)V",
+		garbageValue = "-1287071458"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode {

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "923759114"
+		garbageValue = "-809760850"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -173,7 +173,7 @@ public class FloorOverlayDefinition extends DualNode {
 		double var12 = 0.0D;
 		double var14 = 0.0D;
 		double var16 = (var10 + var8) / 2.0D;
-		if (var10 != var8) {
+		if (var8 != var10) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var10 + var8);
 			}
@@ -185,7 +185,7 @@ public class FloorOverlayDefinition extends DualNode {
 			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var4 == var10) {
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
 			} else if (var6 == var10) {
 				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
 			}
@@ -208,4 +208,55 @@ public class FloorOverlayDefinition extends DualNode {
 		}

 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(Lkz;Llj;I)Llj;",
+		garbageValue = "1335279742"
+	)
+	@Export("readStringIntParameters")
+	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
+		int var2 = var0.readUnsignedByte();
+		int var3;
+		if (var1 == null) {
+			int var4 = var2 - 1;
+			var4 |= var4 >>> 1;
+			var4 |= var4 >>> 2;
+			var4 |= var4 >>> 4;
+			var4 |= var4 >>> 8;
+			var4 |= var4 >>> 16;
+			var3 = var4 + 1;
+			var1 = new IterableNodeHashTable(var3);
+		}
+
+		for (var3 = 0; var3 < var2; ++var3) {
+			boolean var7 = var0.readUnsignedByte() == 1;
+			int var5 = var0.readMedium();
+			Object var6;
+			if (var7) {
+				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
+			} else {
+				var6 = new IntegerNode(var0.readInt());
+			}
+
+			var1.put((Node)var6, (long)var5);
+		}
+
+		return var1;
+	}
+
+	@ObfuscatedName("ey")
+	@ObfuscatedSignature(
+		signature = "(IZZZI)Lio;",
+		garbageValue = "90068714"
+	)
+	@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, DevicePcmPlayerProvider.JagexCache_idxFiles[var0], 1000000);
+		}
+
+		return new Archive(var4, RouteStrategy.masterDisk, var0, var1, var2, var3);
+	}
 }
--- a/runescape-client/src/main/java/FloorUnderlayDefinition.java
+++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java
@@ -3,49 +3,50 @@ 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("ie")
+@ObfuscatedName("il")
@Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
-	static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("j")
+	public static AbstractArchive FloorUnderlayDefinition_archive;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Let;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
-	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("i")
+	static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1690185973
+		intValue = 502539723
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1561731435
+		intValue = -387630933
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 56370407
+		intValue = -1309988489
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1143874615
+		intValue = -1550343627
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -780904451
+		intValue = 241046707
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -58,20 +59,20 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.rgb = 0;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "38"
+		signature = "(I)V",
+		garbageValue = "-2017124449"
 	)
 	@Export("postDecode")
 	void postDecode() {
 		this.setHsl(this.rgb);
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;IB)V",
-		garbageValue = "118"
+		signature = "(Lkz;II)V",
+		garbageValue = "-336580480"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -85,10 +86,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Lky;III)V",
-		garbageValue = "2131813988"
+		signature = "(Lkz;III)V",
+		garbageValue = "1777076366"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -98,10 +99,10 @@ public class FloorUnderlayDefinition extends DualNode {

 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-28210148"
+		garbageValue = "1419999023"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -129,7 +130,7 @@ public class FloorUnderlayDefinition extends DualNode {
 		double var12 = 0.0D;
 		double var14 = 0.0D;
 		double var16 = (var10 + var8) / 2.0D;
-		if (var10 != var8) {
+		if (var8 != var10) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var8 + var10);
 			}
@@ -141,9 +142,9 @@ public class FloorUnderlayDefinition extends DualNode {
 			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var10 == var4) {
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
-			} else if (var10 == var6) {
-				var12 = 4.0D + (var2 - var4) / (var10 - var8);
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+			} else if (var6 == var10) {
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
 			}
 		}

@@ -163,15 +164,67 @@ public class FloorUnderlayDefinition extends DualNode {
 		}

 		if (var16 > 0.5D) {
-			this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16));
+			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
 		} else {
-			this.hueMultiplier = (int)(var16 * var14 * 512.0D);
+			this.hueMultiplier = (int)(512.0D * var16 * var14);
 		}

 		if (this.hueMultiplier < 1) {
 			this.hueMultiplier = 1;
 		}

-		this.hue = (int)(var12 * (double)this.hueMultiplier);
+		this.hue = (int)((double)this.hueMultiplier * var12);
+	}
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZB)I",
+		garbageValue = "1"
+	)
+	static int method4423(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.SOUND_SYNTH) {
+			class160.Interpreter_intStackSize -= 3;
+			class192.queueSoundEffect(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]);
+			return 1;
+		} else if (var0 == ScriptOpcodes.SOUND_SONG) {
+			WorldMapData_1.playSong(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]);
+			return 1;
+		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
+			class160.Interpreter_intStackSize -= 2;
+			SecureRandomCallable.playSoundJingle(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]);
+			return 1;
+		} else {
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("fu")
+	@ObfuscatedSignature(
+		signature = "(Lby;IIB)V",
+		garbageValue = "0"
+	)
+	@Export("performPlayerAnimation")
+	static void performPlayerAnimation(Player var0, int var1, int var2) {
+		if (var0.sequence == var1 && var1 != -1) {
+			int var3 = class83.SequenceDefinition_get(var1).field3502;
+			if (var3 == 1) {
+				var0.sequenceFrame = 0;
+				var0.sequenceFrameCycle = 0;
+				var0.sequenceDelay = var2;
+				var0.field924 = 0;
+			}
+
+			if (var3 == 2) {
+				var0.field924 = 0;
+			}
+		} else if (var1 == -1 || var0.sequence == -1 || class83.SequenceDefinition_get(var1).field3504 >= class83.SequenceDefinition_get(var0.sequence).field3504) {
+			var0.sequence = var1;
+			var0.sequenceFrame = 0;
+			var0.sequenceFrameCycle = 0;
+			var0.sequenceDelay = var2;
+			var0.field924 = 0;
+			var0.field969 = var0.pathLength;
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -2,7 +2,7 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;

-@ObfuscatedName("kb")
+@ObfuscatedName("kf")
@Implements("Font")
 public final class Font extends AbstractFont {
 	public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
@@ -13,7 +13,7 @@ public final class Font extends AbstractFont {
 		super(var1);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("drawGlyph")
 	final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2;
@@ -55,7 +55,7 @@ public final class Font extends AbstractFont {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@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;
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -1,72 +1,66 @@
 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("kz")
+@ObfuscatedName("kn")
@Implements("FontName")
 public class FontName {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("q")
-	public static short[][] field3651;
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lgy;"
+		signature = "Ldm;"
 	)
-	@Export("musicTrack")
-	public static MusicTrack musicTrack;
-	@ObfuscatedName("h")
-	@Export("userHomeDirectory")
-	public static String userHomeDirectory;
-	@ObfuscatedName("bz")
+	@Export("soundSystem")
+	static SoundSystem soundSystem;
+	@ObfuscatedName("dv")
 	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Lio;"
 	)
-	@Export("loginType")
-	static LoginType loginType;
-	@ObfuscatedName("ix")
-	@ObfuscatedGetter(
-		intValue = -1325782569
+	@Export("archive10")
+	static Archive archive10;
+	@ObfuscatedName("gt")
+	@ObfuscatedSignature(
+		signature = "Lli;"
 	)
-	@Export("selectedItemWidget")
-	static int selectedItemWidget;
-	@ObfuscatedName("t")
+	@Export("redHintArrowSprite")
+	static Sprite redHintArrowSprite;
+	@ObfuscatedName("j")
 	@Export("name")
 	String name;

@@ -83,65 +77,781 @@ public class FontName {
 		this.name = var1;
 	}

-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "-11"
-	)
-	@Export("isKeyDown")
-	public static final boolean isKeyDown() {
-		synchronized(KeyHandler.KeyHandler_instance) {
-			if (KeyHandler.field385 == KeyHandler.field383) {
-				return false;
+	@ObfuscatedName("c")
+	public static final int method5287(double var0, double var2, double var4) {
+		double var6 = var4;
+		double var8 = var4;
+		double var10 = var4;
+		if (0.0D != var2) {
+			double var12;
+			if (var4 < 0.5D) {
+				var12 = (var2 + 1.0D) * var4;
 			} else {
-				ReflectionCheck.field1307 = KeyHandler.field376[KeyHandler.field385];
-				SpriteMask.field2499 = KeyHandler.field377[KeyHandler.field385];
-				KeyHandler.field385 = KeyHandler.field385 + 1 & 127;
-				return true;
+				var12 = var2 + var4 - var2 * var4;
+			}
+
+			double var14 = var4 * 2.0D - var12;
+			double var16 = 0.3333333333333333D + var0;
+			if (var16 > 1.0D) {
+				--var16;
+			}
+
+			double var20 = var0 - 0.3333333333333333D;
+			if (var20 < 0.0D) {
+				++var20;
+			}
+
+			if (var16 * 6.0D < 1.0D) {
+				var6 = var14 + var16 * (var12 - var14) * 6.0D;
+			} else if (var16 * 2.0D < 1.0D) {
+				var6 = var12;
+			} else if (3.0D * var16 < 2.0D) {
+				var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14;
+			} else {
+				var6 = var14;
+			}
+
+			if (6.0D * var0 < 1.0D) {
+				var8 = var0 * 6.0D * (var12 - var14) + var14;
+			} else if (2.0D * var0 < 1.0D) {
+				var8 = var12;
+			} else if (3.0D * var0 < 2.0D) {
+				var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14;
+			} else {
+				var8 = var14;
+			}
+
+			if (6.0D * var20 < 1.0D) {
+				var10 = var14 + var20 * (var12 - var14) * 6.0D;
+			} else if (var20 * 2.0D < 1.0D) {
+				var10 = var12;
+			} else if (3.0D * var20 < 2.0D) {
+				var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D;
+			} else {
+				var10 = var14;
 			}
 		}
-	}

-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "(Lhp;IIII)V",
-		garbageValue = "452430417"
-	)
-	@Export("Widget_setKeyRate")
-	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
-		if (var0.field2623 == null) {
-			throw new RuntimeException();
-		} else {
-			var0.field2623[var1] = var2;
-			var0.field2581[var1] = var3;
-		}
+		int var22 = (int)(256.0D * var6);
+		int var13 = (int)(256.0D * var8);
+		int var23 = (int)(var10 * 256.0D);
+		int var15 = var23 + (var13 << 8) + (var22 << 16);
+		return var15;
 	}

 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(CII)Ljava/lang/String;",
-		garbageValue = "993620587"
+		signature = "(I)[Lkn;",
+		garbageValue = "-1831558082"
 	)
-	static String method5230(char var0, int var1) {
-		char[] var2 = new char[var1];
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			var2[var3] = var0;
-		}
-
-		return new String(var2);
+	public static FontName[] method5288() {
+		return new FontName[]{FontName_verdana13, FontName_plain11, FontName_verdana11, FontName_verdana15, FontName_plain12, FontName_bold12};
 	}

-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-1040867769"
+		signature = "(II)Lia;",
+		garbageValue = "1426575141"
 	)
-	@Export("ObjectDefinition_clearCached")
-	public static void ObjectDefinition_clearCached() {
-		ObjectDefinition.ObjectDefinition_cached.clear();
-		ObjectDefinition.ObjectDefinition_cachedModelData.clear();
-		ObjectDefinition.ObjectDefinition_cachedEntities.clear();
-		ObjectDefinition.ObjectDefinition_cachedModels.clear();
+	@Export("getNpcDefinition")
+	public static NPCDefinition getNpcDefinition(int var0) {
+		NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
+			var1 = new NPCDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;II)Z",
+		garbageValue = "-1001272425"
+	)
+	static boolean method5292(String var0, int var1) {
+		return ReflectionCheck.method2261(var0, var1, "openjs");
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "(Lbn;I)V",
+		garbageValue = "76683988"
+	)
+	static void method5284(GameShell var0) {
+		int var4;
+		if (Login.worldSelectOpen) {
+			while (true) {
+				if (!AbstractUserComparator.isKeyDown()) {
+					if (MouseHandler.MouseHandler_lastButton != 1 && (WorldMapSection1.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) {
+						break;
+					}
+
+					int var1 = Login.xPadding + 280;
+					if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(0, 0);
+						break;
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(0, 1);
+						break;
+					}
+
+					int var2 = Login.xPadding + 390;
+					if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(1, 0);
+						break;
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(1, 1);
+						break;
+					}
+
+					int var17 = Login.xPadding + 500;
+					if (MouseHandler.MouseHandler_lastPressedX >= var17 && MouseHandler.MouseHandler_lastPressedX <= var17 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(2, 0);
+						break;
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var17 + 15 && MouseHandler.MouseHandler_lastPressedX <= var17 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(2, 1);
+						break;
+					}
+
+					var4 = Login.xPadding + 610;
+					if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(3, 0);
+						break;
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+						class30.changeWorldSelectSorting(3, 1);
+						break;
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
+						GrandExchangeOfferOwnWorldComparator.method1232();
+						break;
+					}
+
+					if (Login.hoveredWorldIndex != -1) {
+						World var5 = World.World_worlds[Login.hoveredWorldIndex];
+						ReflectionCheck.changeWorld(var5);
+						GrandExchangeOfferOwnWorldComparator.method1232();
+					} else {
+						if (Login.worldSelectPage > 0 && class2.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class2.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) {
+							--Login.worldSelectPage;
+						}
+
+						if (Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapRectangle.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GraphicsDefaults.canvasWidth - WorldMapRectangle.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GraphicsDefaults.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) {
+							++Login.worldSelectPage;
+						}
+					}
+					break;
+				}
+
+				if (class43.field361 == 13) {
+					GrandExchangeOfferOwnWorldComparator.method1232();
+					break;
+				}
+
+				if (class43.field361 == 96) {
+					if (Login.worldSelectPage > 0 && class2.worldSelectLeftSprite != null) {
+						--Login.worldSelectPage;
+					}
+				} else if (class43.field361 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapRectangle.worldSelectRightSprite != null) {
+					++Login.worldSelectPage;
+				}
+			}
+
+		} else {
+			if ((MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
+				Actor.clientPreferences.titleMusicDisabled = !Actor.clientPreferences.titleMusicDisabled;
+				class296.savePreferences();
+				if (!Actor.clientPreferences.titleMusicDisabled) {
+					UserComparator7.method3376(WorldMapDecoration.archive6, "scape main", "", 255, false);
+				} else {
+					class197.midiPcmStream.clear();
+					class197.field2376 = 1;
+					class197.musicTrackArchive = null;
+				}
+			}
+
+			if (Client.gameState != 5) {
+				if (-1L == Login.field1162) {
+					Login.field1162 = SoundCache.method2480() + 1000L;
+				}
+
+				long var12 = SoundCache.method2480();
+				boolean var3;
+				if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
+					while (true) {
+						if (Client.archiveLoaderArchive >= Client.archiveLoaders.size()) {
+							var3 = true;
+							break;
+						}
+
+						ArchiveLoader var16 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive);
+						if (!var16.isLoaded()) {
+							var3 = false;
+							break;
+						}
+
+						++Client.archiveLoaderArchive;
+					}
+				} else {
+					var3 = true;
+				}
+
+				if (var3 && Login.field1164 == -1L) {
+					Login.field1164 = var12;
+					if (Login.field1164 > Login.field1162) {
+						Login.field1162 = Login.field1164;
+					}
+				}
+
+				if (Client.gameState == 10 || Client.gameState == 11) {
+					if (class43.clientLanguage == Language.Language_EN) {
+						if (MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
+							var4 = Login.xPadding + 5;
+							short var14 = 463;
+							byte var6 = 100;
+							byte var7 = 35;
+							if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var6 && MouseHandler.MouseHandler_lastPressedY >= var14 && MouseHandler.MouseHandler_lastPressedY <= var7 + var14) {
+								if (ClientPacket.loadWorlds()) {
+									Login.worldSelectOpen = true;
+									Login.worldSelectPage = 0;
+									Login.worldSelectPagesCount = 0;
+								}
+
+								return;
+							}
+						}
+
+						if (RouteStrategy.World_request != null && ClientPacket.loadWorlds()) {
+							Login.worldSelectOpen = true;
+							Login.worldSelectPage = 0;
+							Login.worldSelectPagesCount = 0;
+						}
+					}
+
+					var4 = MouseHandler.MouseHandler_lastButton;
+					int var25 = MouseHandler.MouseHandler_lastPressedX;
+					int var18 = MouseHandler.MouseHandler_lastPressedY;
+					if (var4 == 0) {
+						var25 = MouseHandler.MouseHandler_x;
+						var18 = MouseHandler.MouseHandler_y;
+					}
+
+					if (!WorldMapSection1.mouseCam && var4 == 4) {
+						var4 = 1;
+					}
+
+					int var8;
+					short var9;
+					if (Login.loginIndex == 0) {
+						boolean var19 = false;
+
+						while (AbstractUserComparator.isKeyDown()) {
+							if (class43.field361 == 84) {
+								var19 = true;
+							}
+						}
+
+						var8 = VarcInt.loginBoxCenter - 80;
+						var9 = 291;
+						if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
+							WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
+						}
+
+						var8 = VarcInt.loginBoxCenter + 80;
+						if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20 || var19) {
+							if ((Client.worldProperties & 33554432) != 0) {
+								Login.Login_response0 = "";
+								Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world.";
+								Login.Login_response2 = "Your normal account will not be affected.";
+								Login.Login_response3 = "";
+								Login.loginIndex = 1;
+								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+									Login.currentLoginField = 1;
+								} else {
+									Login.currentLoginField = 0;
+								}
+							} else if ((Client.worldProperties & 4) != 0) {
+								if ((Client.worldProperties & 1024) != 0) {
+									Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world.";
+									Login.Login_response2 = "Players can attack each other almost everywhere";
+									Login.Login_response3 = "and the Protect Item prayer won't work.";
+								} else {
+									Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world.";
+									Login.Login_response2 = "Players can attack each other";
+									Login.Login_response3 = "almost everywhere.";
+								}
+
+								Login.Login_response0 = "Warning!";
+								Login.loginIndex = 1;
+								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+									Login.currentLoginField = 1;
+								} else {
+									Login.currentLoginField = 0;
+								}
+							} else if ((Client.worldProperties & 1024) != 0) {
+								Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world.";
+								Login.Login_response2 = "The Protect Item prayer will";
+								Login.Login_response3 = "not work on this world.";
+								Login.Login_response0 = "Warning!";
+								Login.loginIndex = 1;
+								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+									Login.currentLoginField = 1;
+								} else {
+									Login.currentLoginField = 0;
+								}
+							} else {
+								WorldMapID.method520(false);
+							}
+						}
+					} else {
+						int var20;
+						short var22;
+						if (Login.loginIndex != 1) {
+							boolean var10;
+							int var11;
+							short var21;
+							if (Login.loginIndex == 2) {
+								var21 = 201;
+								var20 = var21 + 52;
+								if (var4 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) {
+									Login.currentLoginField = 0;
+								}
+
+								var20 += 15;
+								if (var4 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) {
+									Login.currentLoginField = 1;
+								}
+
+								var20 += 15;
+								var21 = 361;
+								if (MusicPatchNode2.field2369 != null) {
+									var8 = MusicPatchNode2.field2369.highX / 2;
+									if (var4 == 1 && var25 >= MusicPatchNode2.field2369.lowX - var8 && var25 <= var8 + MusicPatchNode2.field2369.lowX && var18 >= var21 - 15 && var18 < var21) {
+										switch(Login.field1161) {
+										case 1:
+											Canvas.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
+											Login.loginIndex = 5;
+											return;
+										case 2:
+											WorldMapIcon_0.openURL("https://support.runescape.com/hc/en-gb", true, false);
+										}
+									}
+								}
+
+								var8 = VarcInt.loginBoxCenter - 80;
+								var9 = 321;
+								if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
+									Login.Login_username = Login.Login_username.trim();
+									if (Login.Login_username.length() == 0) {
+										Canvas.setLoginResponseString("", "Please enter your username/email address.", "");
+										return;
+									}
+
+									if (Login.Login_password.length() == 0) {
+										Canvas.setLoginResponseString("", "Please enter your password.", "");
+										return;
+									}
+
+									Canvas.setLoginResponseString("", "Connecting to server...", "");
+									PacketWriter.method2238(false);
+									WorldMapIcon_0.updateGameState(20);
+									return;
+								}
+
+								var8 = Login.loginBoxX + 180 + 80;
+								if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
+									Login.loginIndex = 0;
+									Login.Login_username = "";
+									Login.Login_password = "";
+									class222.field2729 = 0;
+									class81.otp = "";
+									Login.field1183 = true;
+								}
+
+								var8 = VarcInt.loginBoxCenter + -117;
+								var9 = 277;
+								Login.field1169 = var25 >= var8 && var25 < var8 + class4.field17 && var18 >= var9 && var18 < var9 + class267.field3524;
+								if (var4 == 1 && Login.field1169) {
+									Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered;
+									if (!Client.Login_isUsernameRemembered && Actor.clientPreferences.rememberedUsername != null) {
+										Actor.clientPreferences.rememberedUsername = null;
+										class296.savePreferences();
+									}
+								}
+
+								var8 = VarcInt.loginBoxCenter + 24;
+								var9 = 277;
+								Login.field1170 = var25 >= var8 && var25 < var8 + class4.field17 && var18 >= var9 && var18 < var9 + class267.field3524;
+								if (var4 == 1 && Login.field1170) {
+									Actor.clientPreferences.hideUsername = !Actor.clientPreferences.hideUsername;
+									if (!Actor.clientPreferences.hideUsername) {
+										Login.Login_username = "";
+										Actor.clientPreferences.rememberedUsername = null;
+										if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+											Login.currentLoginField = 1;
+										} else {
+											Login.currentLoginField = 0;
+										}
+									}
+
+									class296.savePreferences();
+								}
+
+								while (true) {
+									while (AbstractUserComparator.isKeyDown()) {
+										var10 = false;
+
+										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
+											if (WorldMapIcon_0.field126 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
+												var10 = true;
+												break;
+											}
+										}
+
+										if (class43.field361 == 13) {
+											Login.loginIndex = 0;
+											Login.Login_username = "";
+											Login.Login_password = "";
+											class222.field2729 = 0;
+											class81.otp = "";
+											Login.field1183 = true;
+										} else if (Login.currentLoginField == 0) {
+											if (class43.field361 == 85 && Login.Login_username.length() > 0) {
+												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+											}
+
+											if (class43.field361 == 84 || class43.field361 == 80) {
+												Login.currentLoginField = 1;
+											}
+
+											if (var10 && Login.Login_username.length() < 320) {
+												Login.Login_username = Login.Login_username + WorldMapIcon_0.field126;
+											}
+										} else if (Login.currentLoginField == 1) {
+											if (class43.field361 == 85 && Login.Login_password.length() > 0) {
+												Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1);
+											}
+
+											if (class43.field361 == 84 || class43.field361 == 80) {
+												Login.currentLoginField = 0;
+											}
+
+											if (class43.field361 == 84) {
+												Login.Login_username = Login.Login_username.trim();
+												if (Login.Login_username.length() == 0) {
+													Canvas.setLoginResponseString("", "Please enter your username/email address.", "");
+													return;
+												}
+
+												if (Login.Login_password.length() == 0) {
+													Canvas.setLoginResponseString("", "Please enter your password.", "");
+													return;
+												}
+
+												Canvas.setLoginResponseString("", "Connecting to server...", "");
+												PacketWriter.method2238(false);
+												WorldMapIcon_0.updateGameState(20);
+												return;
+											}
+
+											if (var10 && Login.Login_password.length() < 20) {
+												Login.Login_password = Login.Login_password + WorldMapIcon_0.field126;
+											}
+										}
+									}
+
+									return;
+								}
+							} else if (Login.loginIndex == 3) {
+								var20 = Login.loginBoxX + 180;
+								var22 = 276;
+								if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+									WorldMapID.method520(false);
+								}
+
+								var20 = Login.loginBoxX + 180;
+								var22 = 326;
+								if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+									Canvas.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
+									Login.loginIndex = 5;
+									return;
+								}
+							} else {
+								int var24;
+								if (Login.loginIndex == 4) {
+									var20 = Login.loginBoxX + 180 - 80;
+									var22 = 321;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										class81.otp.trim();
+										if (class81.otp.length() != 6) {
+											Canvas.setLoginResponseString("", "Please enter a 6-digit PIN.", "");
+											return;
+										}
+
+										class222.field2729 = Integer.parseInt(class81.otp);
+										class81.otp = "";
+										PacketWriter.method2238(true);
+										Canvas.setLoginResponseString("", "Connecting to server...", "");
+										WorldMapIcon_0.updateGameState(20);
+										return;
+									}
+
+									if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var18 >= 263 && var18 <= 296) {
+										Login.field1183 = !Login.field1183;
+									}
+
+									if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var18 >= 351 && var18 <= 363) {
+										WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
+									}
+
+									var20 = Login.loginBoxX + 180 + 80;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										Login.loginIndex = 0;
+										Login.Login_username = "";
+										Login.Login_password = "";
+										class222.field2729 = 0;
+										class81.otp = "";
+									}
+
+									while (AbstractUserComparator.isKeyDown()) {
+										boolean var23 = false;
+
+										for (var24 = 0; var24 < "1234567890".length(); ++var24) {
+											if (WorldMapIcon_0.field126 == "1234567890".charAt(var24)) {
+												var23 = true;
+												break;
+											}
+										}
+
+										if (class43.field361 == 13) {
+											Login.loginIndex = 0;
+											Login.Login_username = "";
+											Login.Login_password = "";
+											class222.field2729 = 0;
+											class81.otp = "";
+										} else {
+											if (class43.field361 == 85 && class81.otp.length() > 0) {
+												class81.otp = class81.otp.substring(0, class81.otp.length() - 1);
+											}
+
+											if (class43.field361 == 84) {
+												class81.otp.trim();
+												if (class81.otp.length() != 6) {
+													Canvas.setLoginResponseString("", "Please enter a 6-digit PIN.", "");
+													return;
+												}
+
+												class222.field2729 = Integer.parseInt(class81.otp);
+												class81.otp = "";
+												PacketWriter.method2238(true);
+												Canvas.setLoginResponseString("", "Connecting to server...", "");
+												WorldMapIcon_0.updateGameState(20);
+												return;
+											}
+
+											if (var23 && class81.otp.length() < 6) {
+												class81.otp = class81.otp + WorldMapIcon_0.field126;
+											}
+										}
+									}
+								} else if (Login.loginIndex == 5) {
+									var20 = Login.loginBoxX + 180 - 80;
+									var22 = 321;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapDecorationType.method4099();
+										return;
+									}
+
+									var20 = Login.loginBoxX + 180 + 80;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapID.method520(true);
+									}
+
+									var9 = 361;
+									if (class51.field411 != null) {
+										var24 = class51.field411.highX / 2;
+										if (var4 == 1 && var25 >= class51.field411.lowX - var24 && var25 <= var24 + class51.field411.lowX && var18 >= var9 - 15 && var18 < var9) {
+											WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
+										}
+									}
+
+									while (AbstractUserComparator.isKeyDown()) {
+										var10 = false;
+
+										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
+											if (WorldMapIcon_0.field126 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
+												var10 = true;
+												break;
+											}
+										}
+
+										if (class43.field361 == 13) {
+											WorldMapID.method520(true);
+										} else {
+											if (class43.field361 == 85 && Login.Login_username.length() > 0) {
+												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+											}
+
+											if (class43.field361 == 84) {
+												WorldMapDecorationType.method4099();
+												return;
+											}
+
+											if (var10 && Login.Login_username.length() < 320) {
+												Login.Login_username = Login.Login_username + WorldMapIcon_0.field126;
+											}
+										}
+									}
+								} else if (Login.loginIndex == 6) {
+									while (true) {
+										do {
+											if (!AbstractUserComparator.isKeyDown()) {
+												var21 = 321;
+												if (var4 == 1 && var18 >= var21 - 20 && var18 <= var21 + 20) {
+													WorldMapID.method520(true);
+												}
+
+												return;
+											}
+										} while(class43.field361 != 84 && class43.field361 != 13);
+
+										WorldMapID.method520(true);
+									}
+								} else if (Login.loginIndex == 7) {
+									var20 = Login.loginBoxX + 180 - 80;
+									var22 = 321;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=dob/set_dob.ws", true, false);
+										Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+										Login.loginIndex = 6;
+										return;
+									}
+
+									var20 = Login.loginBoxX + 180 + 80;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapID.method520(true);
+									}
+								} else if (Login.loginIndex == 8) {
+									var20 = Login.loginBoxX + 180 - 80;
+									var22 = 321;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapIcon_0.openURL("https://www.jagex.com/terms/privacy/#eight", true, false);
+										Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+										Login.loginIndex = 6;
+										return;
+									}
+
+									var20 = Login.loginBoxX + 180 + 80;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapID.method520(true);
+									}
+								} else if (Login.loginIndex == 12) {
+									String var15 = "";
+									switch(Login.field1156) {
+									case 0:
+										var15 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
+										break;
+									case 1:
+										var15 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
+										break;
+									default:
+										WorldMapID.method520(false);
+									}
+
+									var8 = Login.loginBoxX + 180;
+									var9 = 276;
+									if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
+										WorldMapIcon_0.openURL(var15, true, false);
+										Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+										Login.loginIndex = 6;
+										return;
+									}
+
+									var8 = Login.loginBoxX + 180;
+									var9 = 326;
+									if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
+										WorldMapID.method520(false);
+									}
+								} else if (Login.loginIndex == 24) {
+									var20 = Login.loginBoxX + 180;
+									var22 = 301;
+									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+										WorldMapID.method520(false);
+									}
+								}
+							}
+						} else {
+							while (AbstractUserComparator.isKeyDown()) {
+								if (class43.field361 == 84) {
+									WorldMapID.method520(false);
+								} else if (class43.field361 == 13) {
+									Login.loginIndex = 0;
+								}
+							}
+
+							var20 = VarcInt.loginBoxCenter - 80;
+							var22 = 321;
+							if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+								WorldMapID.method520(false);
+							}
+
+							var20 = VarcInt.loginBoxCenter + 80;
+							if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
+								Login.loginIndex = 0;
+							}
+						}
+					}
+
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("hw")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
+		garbageValue = "-1882548128"
+	)
+	@Export("insertMenuItemNoShift")
+	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
+		Decimator.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
+	}
+
+	@ObfuscatedName("ku")
+	@ObfuscatedSignature(
+		signature = "(Lhy;I)Lhy;",
+		garbageValue = "1031312756"
+	)
+	static Widget method5290(Widget var0) {
+		int var1 = ScriptFrame.method1086(class60.getWidgetClickMask(var0));
+		if (var1 == 0) {
+			return null;
+		} else {
+			for (int var2 = 0; var2 < var1; ++var2) {
+				var0 = Player.getWidget(var0.parentId);
+				if (var0 == null) {
+					return null;
+				}
+			}
+
+			return var0;
+		}
 	}
 }
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -1,25 +1,27 @@
+import java.io.IOException;
+import java.net.Socket;
 import java.util.HashMap;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("kr")
+@ObfuscatedName("ku")
@Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("map")
 	HashMap map;

@@ -32,10 +34,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([Lkz;I)Ljava/util/HashMap;",
-		garbageValue = "2107388628"
+		signature = "([Lkn;B)Ljava/util/HashMap;",
+		garbageValue = "-84"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -47,7 +49,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = PcmPlayer.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
+				Font var6 = Skeleton.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -58,23 +60,12 @@ public class Fonts {
 		return var2;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		signature = "(I)[Lha;",
-		garbageValue = "1384146854"
+		signature = "(Ljava/net/Socket;III)Lks;",
+		garbageValue = "1860750557"
 	)
-	public static ServerBuild[] method5240() {
-		return new ServerBuild[]{ServerBuild.WIP, ServerBuild.LIVE, ServerBuild.BUILDLIVE, ServerBuild.RC};
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;Lhz;I)V",
-		garbageValue = "-1215139257"
-	)
-	public static void method5234(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
-		SequenceDefinition.SequenceDefinition_archive = var0;
-		SequenceDefinition.SequenceDefinition_animationsArchive = var1;
-		SequenceDefinition.SequenceDefinition_skeletonsArchive = var2;
+	public static AbstractSocket method5293(Socket var0, int var1, int var2) throws IOException {
+		return new BufferedNetSocket(var0, var1, var2);
 	}
 }
--- a/runescape-client/src/main/java/Frames.java
+++ b/runescape-client/src/main/java/Frames.java
@@ -3,27 +3,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ee")
+@ObfuscatedName("ev")
@Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("t")
+	@ObfuscatedName("ep")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lkk;"
 	)
-	@Export("ItemDefinition_modelArchive")
-	static AbstractArchive ItemDefinition_modelArchive;
-	@ObfuscatedName("s")
+	@Export("spriteIds")
+	static GraphicsDefaults spriteIds;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "[Ldi;"
+		signature = "[Ldx;"
 	)
 	@Export("frames")
 	Animation[] frames;

 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;IZ)V",
-		garbageValue = "0"
+		signature = "(Lhz;Lhz;IZ)V"
 	)
-	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
+	Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
 		NodeDeque var5 = new NodeDeque();
 		int var6 = var1.getGroupFileCount(var3);
 		this.frames = new Animation[var6];
@@ -42,7 +41,13 @@ public class Frames extends DualNode {
 			}

 			if (var10 == null) {
-				byte[] var13 = var2.getFile(var11, 0);
+				byte[] var13;
+				if (var4) {
+					var13 = var2.getFile(0, var11);
+				} else {
+					var13 = var2.getFile(var11, 0);
+				}
+
 				var10 = new Skeleton(var11, var13);
 				var5.addFirst(var10);
 			}
@@ -52,33 +57,33 @@ public class Frames extends DualNode {

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
-		garbageValue = "-5"
+		signature = "(II)Z",
+		garbageValue = "1628861134"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}

-	@ObfuscatedName("ix")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-737033535"
+		signature = "(B)[Lkc;",
+		garbageValue = "50"
 	)
-	@Export("formatItemStacks")
-	static final String formatItemStacks(int var0) {
-		String var1 = Integer.toString(var0);
+	@Export("ChatMode_values")
+	static PrivateChatMode[] ChatMode_values() {
+		return new PrivateChatMode[]{PrivateChatMode.field3786, PrivateChatMode.field3789, PrivateChatMode.field3788};
+	}

-		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
-			var1 = var1.substring(0, var2) + "," + var1.substring(var2);
-		}
-
-		if (var1.length() > 9) {
-			return " " + class16.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
-		} else {
-			return var1.length() > 6 ? " " + class16.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + class16.colorStartTag(16776960) + var1 + "</col>";
-		}
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(I)Lbb;",
+		garbageValue = "1062873352"
+	)
+	@Export("getNextWorldListWorld")
+	static World getNextWorldListWorld() {
+		return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null;
 	}
 }
--- a/runescape-client/src/main/java/Friend.java
+++ b/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("ja")
+@ObfuscatedName("jy")
@Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("s")
-	boolean field3607;
-	@ObfuscatedName("j")
-	boolean field3606;
+	@ObfuscatedName("c")
+	boolean field3599;
+	@ObfuscatedName("x")
+	boolean field3598;

 	Friend() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lja;B)I",
-		garbageValue = "113"
+		signature = "(Ljy;B)I",
+		garbageValue = "0"
 	)
 	@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.field3607 && !var1.field3607) {
+		} else if (this.field3599 && !var1.field3599) {
 			return -1;
-		} else if (!this.field3607 && var1.field3607) {
+		} else if (!this.field3599 && var1.field3599) {
 			return 1;
-		} else if (this.field3606 && !var1.field3606) {
+		} else if (this.field3598 && !var1.field3598) {
 			return -1;
-		} else if (!this.field3606 && var1.field3606) {
+		} else if (!this.field3598 && var1.field3598) {
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}

-	@ObfuscatedName("ai")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		signature = "(Lju;B)I",
-		garbageValue = "1"
+		signature = "(Ljw;B)I",
+		garbageValue = "-92"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -56,45 +56,30 @@ public class Friend extends Buddy {
 		return this.compareToFriend((Friend)var1);
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IZB)Ljava/lang/String;",
-		garbageValue = "104"
+		signature = "(ILkx;Lio;I)V",
+		garbageValue = "-394636832"
 	)
-	@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;
+	static void method5190(int var0, ArchiveDisk var1, Archive var2) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction();
+		var3.type = 1;
+		var3.key = (long)var0;
+		var3.archiveDisk = var1;
+		var3.archive = var2;
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
+		}

-				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);
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+			if (ArchiveDiskActionHandler.field3126 == 0) {
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
 			}

-			return var2;
-		} else {
-			return Integer.toString(var0);
+			ArchiveDiskActionHandler.field3126 = 600;
 		}
 	}
 }
--- a/runescape-client/src/main/java/FriendLoginUpdate.java
+++ b/runescape-client/src/main/java/FriendLoginUpdate.java
@@ -4,116 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jv")
+@ObfuscatedName("jp")
@Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -684756909
+		intValue = 235623703
 	)
-	public int field3621;
-	@ObfuscatedName("k")
+	public int field3613;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ljx;"
+		signature = "Ljt;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("world")
 	public short world;

 	@ObfuscatedSignature(
-		signature = "(Ljx;I)V"
+		signature = "(Ljt;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3621 = (int)(SequenceDefinition.method4686() / 1000L);
+		this.field3613 = (int)(SoundCache.method2480() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(CLgk;I)C",
-		garbageValue = "-2143738383"
-	)
-	@Export("standardizeChar")
-	static char standardizeChar(char var0, Language var1) {
-		if (var0 >= 192 && var0 <= 255) {
-			if (var0 >= 192 && var0 <= 198) {
-				return 'A';
-			}
-
-			if (var0 == 199) {
-				return 'C';
-			}
-
-			if (var0 >= 200 && var0 <= 203) {
-				return 'E';
-			}
-
-			if (var0 >= 204 && var0 <= 207) {
-				return 'I';
-			}
-
-			if (var0 == 209 && var1 != Language.Language_ES) {
-				return 'N';
-			}
-
-			if (var0 >= 210 && var0 <= 214) {
-				return 'O';
-			}
-
-			if (var0 >= 217 && var0 <= 220) {
-				return 'U';
-			}
-
-			if (var0 == 221) {
-				return 'Y';
-			}
-
-			if (var0 == 223) {
-				return 's';
-			}
-
-			if (var0 >= 224 && var0 <= 230) {
-				return 'a';
-			}
-
-			if (var0 == 231) {
-				return 'c';
-			}
-
-			if (var0 >= 232 && var0 <= 235) {
-				return 'e';
-			}
-
-			if (var0 >= 236 && var0 <= 239) {
-				return 'i';
-			}
-
-			if (var0 == 241 && var1 != Language.Language_ES) {
-				return 'n';
-			}
-
-			if (var0 >= 242 && var0 <= 246) {
-				return 'o';
-			}
-
-			if (var0 >= 249 && var0 <= 252) {
-				return 'u';
-			}
-
-			if (var0 == 253 || var0 == 255) {
-				return 'y';
-			}
-		}
-
-		if (var0 == 338) {
-			return 'O';
-		} else if (var0 == 339) {
-			return 'o';
-		} else {
-			return var0 == 376 ? 'Y' : var0;
-		}
-	}
 }
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -3,99 +3,100 @@ 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("ba")
+@ObfuscatedName("bc")
@Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("cs")
-	@Export("mouseCam")
-	static boolean mouseCam;
-	@ObfuscatedName("hn")
+	@ObfuscatedName("qh")
 	@ObfuscatedGetter(
-		intValue = 2015707871
+		intValue = -1955536512
 	)
-	@Export("oculusOrbFocalPointY")
-	static int oculusOrbFocalPointY;
-	@ObfuscatedName("k")
+	static int field1037;
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Lfk;"
+	)
+	@Export("clock")
+	static Clock clock;
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ljo;"
+		signature = "Ljx;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ljk;"
+		signature = "Lji;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1694848325
+		intValue = 1109899493
 	)
-	int field1045;
+	int field1034;

 	@ObfuscatedSignature(
-		signature = "(Llu;)V"
+		signature = "(Lll;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1045 = 0;
+		this.field1034 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
-		garbageValue = "-3646"
+		signature = "(I)Z",
+		garbageValue = "1338647349"
 	)
-	boolean method1773() {
-		return this.field1045 == 2;
+	boolean method1825() {
+		return this.field1034 == 2;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-52"
+		garbageValue = "1"
 	)
-	final void method1774() {
-		this.field1045 = 1;
+	final void method1856() {
+		this.field1034 = 1;
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;II)V",
-		garbageValue = "-1957399935"
+		signature = "(Lkz;IB)V",
+		garbageValue = "0"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1045 = 2;
-		class3.FriendSystem_invalidateFriends();
+		this.field1034 = 2;
+		WallDecoration.FriendSystem_invalidateFriends();
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-688345786"
+		garbageValue = "-916004239"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3621 < SequenceDefinition.method4686() / 1000L - 5L) {
+			if ((long)var1.field3613 < SoundCache.method2480() / 1000L - 5L) {
 				if (var1.world > 0) {
-					DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged in.");
+					WorldMapCacheName.addGameMessage(5, "", var1.username + " has logged in.");
 				}

 				if (var1.world == 0) {
-					DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged out.");
+					WorldMapCacheName.addGameMessage(5, "", var1.username + " has logged out.");
 				}

 				var1.remove();
@@ -104,38 +105,38 @@ public class FriendSystem {

 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "452224146"
+		garbageValue = "299049416"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1045 = 0;
+		this.field1034 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljx;ZI)Z",
-		garbageValue = "1695640889"
+		signature = "(Ljt;ZI)Z",
+		garbageValue = "1657738118"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(WorldMapIcon_1.localPlayer.username)) {
+		} else if (var1.equals(Varps.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Ljx;I)Z",
-		garbageValue = "-33196880"
+		signature = "(Ljt;I)Z",
+		garbageValue = "2143942402"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -146,10 +147,10 @@ public class FriendSystem {
 		}
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "6"
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "365133706"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -157,94 +158,72 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsListIsFull()) {
-					class3.method53();
+					WorldMapSection2.method283("Your friend list is full. Max of 200 for free users, and 400 for members");
+				} else if (Varps.localPlayer.username.equals(var2)) {
+					class1.method9();
+				} else if (this.isFriended(var2, false)) {
+					Calendar.method3933(var1);
+				} else if (this.isIgnored(var2)) {
+					WorldMapSection2.method283("Please remove " + var1 + " from your ignore list first");
 				} else {
-					StringBuilder var10000;
-					String var4;
-					if (WorldMapIcon_1.localPlayer.username.equals(var2)) {
-						var10000 = null;
-						var4 = "You can't add yourself to your own friend list";
-						DirectByteArrayCopier.addGameMessage(30, "", var4);
-					} else if (this.isFriended(var2, false)) {
-						NPC.method1976(var1);
-					} else if (this.isIgnored(var2)) {
-						var10000 = new StringBuilder();
-						Object var10001 = null;
-						var10000 = var10000.append("Please remove ").append(var1);
-						var10001 = null;
-						var4 = var10000.append(" from your ignore list first").toString();
-						DirectByteArrayCopier.addGameMessage(30, "", var4);
-					} else {
-						PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher);
-						var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
-						var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-						Client.packetWriter.addNode(var3);
-					}
+					WorldMapLabelSize.method172(var1);
 				}
 			}
 		}
 	}

-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "-21"
+		signature = "(I)Z",
+		garbageValue = "-567390482"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field741 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field739 != 1;
 	}

-	@ObfuscatedName("c")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1615716489"
+		garbageValue = "-1635625891"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
 		if (var1 != null) {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
-				StringBuilder var10000;
-				String var3;
 				if (this.canAddIgnore()) {
-					var10000 = null;
-					var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
-					DirectByteArrayCopier.addGameMessage(30, "", var3);
-				} else if (WorldMapIcon_1.localPlayer.username.equals(var2)) {
-					var10000 = null;
-					var3 = "You can't add yourself to your own ignore list";
-					DirectByteArrayCopier.addGameMessage(30, "", var3);
+					WorldMapSection2.method283("Your ignore list is full. Max of 100 for free users, and 400 for members");
+				} else if (Varps.localPlayer.username.equals(var2)) {
+					Huffman.method3943();
 				} else if (this.isIgnored(var2)) {
-					AbstractWorldMapIcon.method591(var1);
+					WorldMapSection2.method283(var1 + " is already on your ignore list");
 				} else if (this.isFriended(var2, false)) {
-					var10000 = new StringBuilder();
-					Object var10001 = null;
-					var10000 = var10000.append("Please remove ").append(var1);
-					var10001 = null;
-					var3 = var10000.append(" from your friend list first").toString();
-					DirectByteArrayCopier.addGameMessage(30, "", var3);
+					WorldMapSection2.method283("Please remove " + var1 + " from your friend list first");
 				} else {
-					Huffman.method3902(var1);
+					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher);
+					var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
+					Client.packetWriter.addNode(var3);
 				}
 			}
 		}
 	}

-	@ObfuscatedName("p")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "1672650441"
+		signature = "(B)Z",
+		garbageValue = "-41"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field741 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field739 != 1;
 	}

-	@ObfuscatedName("g")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-123"
+		garbageValue = "73"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -252,22 +231,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					class43.method759();
-					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
+					GrandExchangeEvents.method66();
+					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher);
+					var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}

-				class3.FriendSystem_invalidateFriends();
+				WallDecoration.FriendSystem_invalidateFriends();
 			}
 		}
 	}

-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "2"
+		signature = "(Ljava/lang/String;S)V",
+		garbageValue = "257"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -275,22 +254,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					class43.method759();
-					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
+					GrandExchangeEvents.method66();
+					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher);
+					var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}

-				InterfaceParent.FriendSystem_invalidateIgnoreds();
+				HealthBarUpdate.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}

-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Ljx;I)Z",
-		garbageValue = "2127242291"
+		signature = "(Ljt;I)Z",
+		garbageValue = "-1345116753"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
@@ -298,146 +277,47 @@ public class FriendSystem {
 		return var2 != null && var2.hasWorld();
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([Lgn;II)Lgn;",
-		garbageValue = "-2035427993"
+		signature = "(I)V",
+		garbageValue = "591224258"
 	)
-	@Export("findEnumerated")
-	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-		Enumerated[] var2 = var0;
-
-		for (int var3 = 0; var3 < var2.length; ++var3) {
-			Enumerated var4 = var2[var3];
-			if (var1 == var4.rsOrdinal()) {
-				return var4;
+	public static void method1871() {
+		if (KeyHandler.KeyHandler_instance != null) {
+			synchronized(KeyHandler.KeyHandler_instance) {
+				KeyHandler.KeyHandler_instance = null;
 			}
 		}

-		return null;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("ih")
 	@ObfuscatedSignature(
-		signature = "(I)[Lia;",
-		garbageValue = "173195137"
+		signature = "(II)Ljava/lang/String;",
+		garbageValue = "-1994917329"
 	)
-	static VerticalAlignment[] method1830() {
-		return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3172, VerticalAlignment.field3174};
-	}
+	@Export("formatItemStacks")
+	static final String formatItemStacks(int var0) {
+		String var1 = Integer.toString(var0);

-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(ILcr;ZI)I",
-		garbageValue = "1342968347"
-	)
-	static int method1831(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		if (var0 == ScriptOpcodes.CC_CREATE) {
-			Interpreter.Interpreter_intStackSize -= 3;
-			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-			if (var4 == 0) {
-				throw new RuntimeException();
-			} else {
-				Widget var6 = WorldMapElement.getWidget(var3);
-				if (var6.children == null) {
-					var6.children = new Widget[var5 + 1];
-				}
+		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
+			var1 = var1.substring(0, var2) + "," + var1.substring(var2);
+		}

-				if (var6.children.length <= var5) {
-					Widget[] var7 = new Widget[var5 + 1];
-
-					for (int var8 = 0; var8 < var6.children.length; ++var8) {
-						var7[var8] = var6.children[var8];
-					}
-
-					var6.children = var7;
-				}
-
-				if (var5 > 0 && var6.children[var5 - 1] == null) {
-					throw new RuntimeException("" + (var5 - 1));
-				} else {
-					Widget var12 = new Widget();
-					var12.type = var4;
-					var12.parentId = var12.id = var6.id;
-					var12.childIndex = var5;
-					var12.isIf3 = true;
-					var6.children[var5] = var12;
-					if (var2) {
-						class286.field3623 = var12;
-					} else {
-						class297.field3693 = var12;
-					}
-
-					invalidateWidget(var6);
-					return 1;
-				}
-			}
+		if (var1.length() > 9) {
+			return " " + UserComparator7.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
 		} else {
-			Widget var9;
-			if (var0 == ScriptOpcodes.CC_DELETE) {
-				var9 = var2 ? class286.field3623 : class297.field3693;
-				Widget var10 = WorldMapElement.getWidget(var9.id);
-				var10.children[var9.childIndex] = null;
-				invalidateWidget(var10);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
-				var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-				var9.children = null;
-				invalidateWidget(var9);
-				return 1;
-			} else if (var0 != ScriptOpcodes.CC_FIND) {
-				if (var0 == ScriptOpcodes.IF_FIND) {
-					var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-					if (var9 != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-						if (var2) {
-							class286.field3623 = var9;
-						} else {
-							class297.field3693 = var9;
-						}
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else {
-					return 2;
-				}
-			} else {
-				Interpreter.Interpreter_intStackSize -= 2;
-				var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				Widget var11 = ModelData0.getWidgetChild(var3, var4);
-				if (var11 != null && var4 != -1) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-					if (var2) {
-						class286.field3623 = var11;
-					} else {
-						class297.field3693 = var11;
-					}
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-				}
-
-				return 1;
-			}
+			return var1.length() > 6 ? " " + UserComparator7.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + UserComparator7.colorStartTag(16776960) + var1 + "</col>";
 		}
 	}

-	@ObfuscatedName("jk")
+	@ObfuscatedName("ip")
 	@ObfuscatedSignature(
-		signature = "(Lhp;I)V",
-		garbageValue = "-1019792182"
+		signature = "(ZB)V",
+		garbageValue = "71"
 	)
-	@Export("invalidateWidget")
-	static void invalidateWidget(Widget var0) {
-		if (var0.cycle == Client.field752) {
-			Client.field703[var0.rootIndex] = true;
-		}
-
+	@Export("setTapToDrop")
+	static void setTapToDrop(boolean var0) {
+		Client.tapToDrop = var0;
 	}
 }
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/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("jo")
+@ObfuscatedName("jx")
@Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1273879743
+		intValue = -699388303
 	)
-	int field3600;
-	@ObfuscatedName("f")
+	int field3587;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ljf;"
+		signature = "Ljo;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;

 	@ObfuscatedSignature(
-		signature = "(Llu;)V"
+		signature = "(Lll;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3600 = 1;
+		this.field3587 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Lju;",
-		garbageValue = "-192021045"
+		signature = "(I)Ljw;",
+		garbageValue = "-734254876"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)[Lju;",
-		garbageValue = "518998026"
+		signature = "(II)[Ljw;",
+		garbageValue = "1353779565"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Ljx;ZI)Z",
-		garbageValue = "-1515368457"
+		signature = "(Ljt;ZB)Z",
+		garbageValue = "0"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -70,10 +70,10 @@ public class FriendsList extends UserList {
 		}
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lky;IB)V",
-		garbageValue = "0"
+		signature = "(Lkz;II)V",
+		garbageValue = "149092737"
 	)
 	@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.field3600 - 1;
+						var11.int2 = ++this.field3587 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * 1037739243) * 1487463363;
+							var11.int2 = -(var11.int2 * -2054461169) * 725247471;
 						}

 						var11.world = var6;
 					}

 					var11.rank = var7;
-					var11.field3607 = var9;
-					var11.field3606 = var10;
+					var11.field3599 = var9;
+					var11.field3598 = var10;
 					continue;
 				}

@@ -159,47 +159,68 @@ public class FriendsList extends UserList {
 		}
 	}

-	@ObfuscatedName("fk")
-	@ObfuscatedSignature(
-		signature = "(Lbd;III)V",
-		garbageValue = "1475900100"
-	)
-	@Export("performPlayerAnimation")
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
-		if (var0.sequence == var1 && var1 != -1) {
-			int var3 = Widget.SequenceDefinition_get(var1).field3492;
-			if (var3 == 1) {
-				var0.sequenceFrame = 0;
-				var0.sequenceFrameCycle = 0;
-				var0.sequenceDelay = var2;
-				var0.field964 = 0;
+	@ObfuscatedName("c")
+	@Export("sleepMillis")
+	public static final void sleepMillis(long var0) {
+		if (var0 > 0L) {
+			if (var0 % 10L == 0L) {
+				long var2 = var0 - 1L;
+
+				try {
+					Thread.sleep(var2);
+				} catch (InterruptedException var8) {
+				}
+
+				try {
+					Thread.sleep(1L);
+				} catch (InterruptedException var7) {
+				}
+			} else {
+				try {
+					Thread.sleep(var0);
+				} catch (InterruptedException var6) {
+				}
 			}

-			if (var3 == 2) {
-				var0.field964 = 0;
-			}
-		} else if (var1 == -1 || var0.sequence == -1 || Widget.SequenceDefinition_get(var1).field3508 >= Widget.SequenceDefinition_get(var0.sequence).field3508) {
-			var0.sequence = var1;
-			var0.sequenceFrame = 0;
-			var0.sequenceFrameCycle = 0;
-			var0.sequenceDelay = var2;
-			var0.field964 = 0;
-			var0.field947 = var0.pathLength;
 		}
-
 	}

-	@ObfuscatedName("ht")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
-		garbageValue = "-11"
+		signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
+		garbageValue = "6"
 	)
-	static final void method5102(int var0, int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
-			if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
-				Client.field829[var4] = true;
+	public static String method5163(CharSequence var0) {
+		int var1 = var0.length();
+		StringBuilder var2 = new StringBuilder(var1);
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			char var4 = var0.charAt(var3);
+			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
+				if (var4 == ' ') {
+					var2.append('+');
+				} else {
+					byte var5 = MenuAction.charToByteCp1252(var4);
+					var2.append('%');
+					int var6 = var5 >> 4 & 15;
+					if (var6 >= 10) {
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48));
+					}
+
+					var6 = var5 & 15;
+					if (var6 >= 10) {
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48));
+					}
+				}
+			} else {
+				var2.append(var4);
 			}
 		}

+		return var2.toString();
 	}
 }
--- a/runescape-client/src/main/java/GZipDecompressor.java
+++ b/runescape-client/src/main/java/GZipDecompressor.java
@@ -1,19 +1,13 @@
 import java.util.zip.Inflater;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("lc")
+@ObfuscatedName("lu")
@Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = -145342191
-	)
-	public static int field4007;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("inflater")
 	Inflater inflater;

@@ -28,10 +22,10 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lky;[BI)V",
-		garbageValue = "-1662982609"
+		signature = "(Lkz;[BB)V",
+		garbageValue = "0"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {
@@ -54,26 +48,29 @@ public class GZipDecompressor {
 		}
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("fb")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "-2077179875"
+		signature = "(Ljava/lang/String;ZI)V",
+		garbageValue = "-1847999572"
 	)
-	static void method6390(boolean var0) {
-		Login.Login_response1 = "";
-		Login.Login_response2 = "Enter your username/email & password.";
-		Login.Login_response3 = "";
-		Login.loginIndex = 2;
-		if (var0) {
-			Login.Login_password = "";
-		}
+	@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 = class197.fontPlain12.lineWidth(var0, 250);
+			int var6 = class197.fontPlain12.lineCount(var0, 250) * 13;
+			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0);
+			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 16777215);
+			class197.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
+			HealthBar.method2007(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2);
+			if (var1) {
+				DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0);
+			} else {
+				WorldMapElement.method4392(var3, var4, var5, var6);
+			}

-		ItemContainer.method1120();
-		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
-			Login.currentLoginField = 1;
-		} else {
-			Login.currentLoginField = 0;
 		}
-
 	}
 }
--- a/runescape-client/src/main/java/GameObject.java
+++ b/runescape-client/src/main/java/GameObject.java
@@ -4,100 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ej")
+@ObfuscatedName("ef")
@Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("sg")
-	@ObfuscatedSignature(
-		signature = "Lic;"
-	)
-	public static class237 field1921;
-	@ObfuscatedName("dg")
-	@ObfuscatedSignature(
-		signature = "Lid;"
-	)
-	@Export("archive10")
-	static Archive archive10;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 744501361
+		intValue = -373728187
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2026651009
-	)
-	@Export("height")
-	int height;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -500411517
-	)
-	@Export("centerX")
-	int centerX;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = -560576891
+		intValue = 351218671
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("u")
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -722622461
+	)
+	@Export("height")
+	int height;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = -1130119677
+	)
+	@Export("centerX")
+	int centerX;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Len;"
+		signature = "Lel;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 939156699
+		intValue = -1883842779
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 86850281
+		intValue = -1330255505
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -698919929
+		intValue = -941264089
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1676112193
+		intValue = -2072718285
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 2114738955
+		intValue = -1022796885
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1792624973
+		intValue = -1238429947
 	)
-	int field1916;
-	@ObfuscatedName("c")
+	int field1904;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1739525873
+		intValue = 792454525
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = 7927595607641920085L
+		longValue = -8257733995685858193L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 692610593
+		intValue = -1096273189
 	)
 	@Export("flags")
 	int flags;
@@ -107,25 +96,99 @@ public final class GameObject {
 		this.flags = 0;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZZI)V",
-		garbageValue = "-1828723850"
+		signature = "(Lhz;Lhz;S)V",
+		garbageValue = "390"
 	)
-	@Export("openURL")
-	public static void openURL(String var0, boolean var1, boolean var2) {
-		StudioGame.method4056(var0, var1, "openjs", var2);
+	@Export("NpcDefinition_setArchives")
+	public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
+		NPCDefinition.NpcDefinition_archive = var0;
+		NPCDefinition.NpcDefinition_modelArchive = var1;
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("x")
+	public static String method3262(long var0) {
+		if (var0 > 0L && var0 < 6582952005840035281L) {
+			if (var0 % 37L == 0L) {
+				return null;
+			} else {
+				int var2 = 0;
+
+				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
+					++var2;
+				}
+
+				StringBuilder var5 = new StringBuilder(var2);
+
+				while (var0 != 0L) {
+					long var6 = var0;
+					var0 /= 37L;
+					var5.append(class288.base37Table[(int)(var6 - var0 * 37L)]);
+				}
+
+				return var5.reverse().toString();
+			}
+		} else {
+			return null;
+		}
+	}
+
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "-2110373438"
+		signature = "(II)Lkc;",
+		garbageValue = "143572048"
 	)
-	@Export("ViewportMouse_unpackY")
-	public static int ViewportMouse_unpackY(int var0) {
-		long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
-		int var1 = (int)(var2 >>> 7 & 127L);
-		return var1;
+	public static PrivateChatMode method3263(int var0) {
+		PrivateChatMode[] var1 = Frames.ChatMode_values();
+
+		for (int var2 = 0; var2 < var1.length; ++var2) {
+			PrivateChatMode var3 = var1[var2];
+			if (var0 == var3.field3787) {
+				return var3;
+			}
+		}
+
+		return null;
+	}
+
+	@ObfuscatedName("gz")
+	@ObfuscatedSignature(
+		signature = "(Lby;ZI)V",
+		garbageValue = "100665877"
+	)
+	@Export("addPlayerToScene")
+	static void addPlayerToScene(Player var0, boolean var1) {
+		if (var0 != null && var0.isVisible() && !var0.isHidden) {
+			var0.isUnanimated = false;
+			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.readySequence == var0.movementSequence) {
+				var0.isUnanimated = true;
+			}
+
+			int var2 = var0.x * -78439701 >> 7;
+			int var3 = var0.y >> 7;
+			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
+				long var4 = WorldMapIcon_1.calculateTag(0, 0, 0, false, var0.index);
+				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) {
+					var0.isUnanimated = false;
+					var0.tileHeight = WorldMapAreaData.getTileHeight(var0.x * -78439701, var0.y, MouseRecorder.plane);
+					var0.playerCycle = Client.cycle;
+					WorldMapIcon_1.scene.addNullableObject(MouseRecorder.plane, var0.x * -78439701, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field601, var0.field602, var0.field609, var0.field604);
+				} else {
+					if ((var0.x * -78439701 & 127) == 64 && (var0.y & 127) == 64) {
+						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
+							return;
+						}
+
+						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount;
+					}
+
+					var0.tileHeight = WorldMapAreaData.getTileHeight(var0.x * -78439701, var0.y, MouseRecorder.plane);
+					var0.playerCycle = Client.cycle;
+					WorldMapIcon_1.scene.drawEntity(MouseRecorder.plane, var0.x * -78439701, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking);
+				}
+			}
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/GameShell.java
+++ b/runescape-client/src/main/java/GameShell.java
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -1,56 +1,45 @@
-import java.lang.management.GarbageCollectorMXBean;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("q")
+@ObfuscatedName("v")
@Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 1320136717
-	)
-	static int field50;
-	@ObfuscatedName("g")
-	public static String[] field47;
-	@ObfuscatedName("ad")
-	@Export("garbageCollector")
-	static GarbageCollectorMXBean garbageCollector;
-	@ObfuscatedName("ds")
+	@ObfuscatedName("fi")
 	@ObfuscatedSignature(
-		signature = "Lid;"
+		signature = "Lkf;"
 	)
-	@Export("archive6")
-	static Archive archive6;
-	@ObfuscatedName("s")
+	@Export("fontPlain11")
+	static Font fontPlain11;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -997401899
+		intValue = -158786095
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		longValue = 3311995201519859273L
+		longValue = 3834067055658986045L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ld;"
+		signature = "Lz;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("previousOfferName")
 	String previousOfferName;

 	@ObfuscatedSignature(
-		signature = "(Lky;BI)V"
+		signature = "(Lkz;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated();
@@ -60,8 +49,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt();
 		int var5 = var1.readInt();
 		this.grandExchangeOffer = new GrandExchangeOffer();
-		this.grandExchangeOffer.method108(2);
-		this.grandExchangeOffer.method124(var2);
+		this.grandExchangeOffer.method98(2);
+		this.grandExchangeOffer.method92(var2);
 		this.grandExchangeOffer.unitPrice = var4;
 		this.grandExchangeOffer.totalQuantity = var5;
 		this.grandExchangeOffer.currentQuantity = 0;
@@ -69,675 +58,54 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Ljava/lang/String;",
-		garbageValue = "-894568552"
+		signature = "(B)Ljava/lang/String;",
+		garbageValue = "1"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Ljava/lang/String;",
-		garbageValue = "1580771980"
+		signature = "(B)Ljava/lang/String;",
+		garbageValue = "3"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName;
 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Lkb;Lkb;Lkb;B)V",
-		garbageValue = "-43"
+		signature = "(Ljava/lang/CharSequence;II)I",
+		garbageValue = "1731864296"
 	)
-	@Export("drawTitle")
-	static void drawTitle(Font var0, Font var1, Font var2) {
-		Login.xPadding = (KitDefinition.canvasWidth - 765) / 2;
-		Login.loginBoxX = Login.xPadding + 202;
-		Login.loginBoxCenter = Login.loginBoxX + 180;
-		byte var23;
-		int var24;
-		int var27;
-		int var35;
-		int var46;
-		if (Login.worldSelectOpen) {
-			if (SoundCache.worldSelectBackSprites == null) {
-				SoundCache.worldSelectBackSprites = class30.method535(class2.archive8, "sl_back", "");
+	public static int method74(CharSequence var0, int var1) {
+		return class51.parseIntCustomRadix(var0, var1, true);
+	}
+
+	@ObfuscatedName("jq")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-57"
+	)
+	static final void method73() {
+		PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher);
+		Client.packetWriter.addNode(var0);
+
+		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
+			if (var1.type == 0 || var1.type == 3) {
+				StructDefinition.closeInterface(var1, true);
 			}
-
-			IndexedSprite[] var7;
-			IndexedSprite[] var29;
-			IndexedSprite var30;
-			Archive var33;
-			int var34;
-			int var39;
-			if (class1.worldSelectFlagSprites == null) {
-				var33 = class2.archive8;
-				var35 = var33.getGroupId("sl_flags");
-				var34 = var33.getFileId(var35, "");
-				if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) {
-					var7 = null;
-				} else {
-					var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
-
-					for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) {
-						var30 = var29[var39] = new IndexedSprite();
-						var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
-						var30.height = class325.SpriteBuffer_spriteHeight;
-						var30.xOffset = class325.SpriteBuffer_xOffsets[var39];
-						var30.yOffset = class325.SpriteBuffer_yOffsets[var39];
-						var30.subWidth = class325.SpriteBuffer_spriteWidths[var39];
-						var30.subHeight = class225.SpriteBuffer_spriteHeights[var39];
-						var30.palette = class325.SpriteBuffer_spritePalette;
-						var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39];
-					}
-
-					UserComparator7.SpriteBuffer_clear();
-					var7 = var29;
-				}
-
-				class1.worldSelectFlagSprites = var7;
-			}
-
-			if (Decimator.worldSelectArrows == null) {
-				var33 = class2.archive8;
-				var35 = var33.getGroupId("sl_arrows");
-				var34 = var33.getFileId(var35, "");
-				if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) {
-					var7 = null;
-				} else {
-					var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
-
-					for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) {
-						var30 = var29[var39] = new IndexedSprite();
-						var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
-						var30.height = class325.SpriteBuffer_spriteHeight;
-						var30.xOffset = class325.SpriteBuffer_xOffsets[var39];
-						var30.yOffset = class325.SpriteBuffer_yOffsets[var39];
-						var30.subWidth = class325.SpriteBuffer_spriteWidths[var39];
-						var30.subHeight = class225.SpriteBuffer_spriteHeights[var39];
-						var30.palette = class325.SpriteBuffer_spritePalette;
-						var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39];
-					}
-
-					UserComparator7.SpriteBuffer_clear();
-					var7 = var29;
-				}
-
-				Decimator.worldSelectArrows = var7;
-			}
-
-			if (NetFileRequest.worldSelectStars == null) {
-				var33 = class2.archive8;
-				var35 = var33.getGroupId("sl_stars");
-				var34 = var33.getFileId(var35, "");
-				if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) {
-					var7 = null;
-				} else {
-					var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
-
-					for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) {
-						var30 = var29[var39] = new IndexedSprite();
-						var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
-						var30.height = class325.SpriteBuffer_spriteHeight;
-						var30.xOffset = class325.SpriteBuffer_xOffsets[var39];
-						var30.yOffset = class325.SpriteBuffer_yOffsets[var39];
-						var30.subWidth = class325.SpriteBuffer_spriteWidths[var39];
-						var30.subHeight = class225.SpriteBuffer_spriteHeights[var39];
-						var30.palette = class325.SpriteBuffer_spritePalette;
-						var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39];
-					}
-
-					UserComparator7.SpriteBuffer_clear();
-					var7 = var29;
-				}
-
-				NetFileRequest.worldSelectStars = var7;
-			}
-
-			if (AbstractWorldMapIcon.worldSelectLeftSprite == null) {
-				AbstractWorldMapIcon.worldSelectLeftSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "leftarrow", "");
-			}
-
-			if (ClanChat.worldSelectRightSprite == null) {
-				ClanChat.worldSelectRightSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "rightarrow", "");
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
-			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624);
-			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513);
-			var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
-			if (NetFileRequest.worldSelectStars != null) {
-				NetFileRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
-				var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1);
-				NetFileRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12);
-				var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1);
-			}
-
-			if (Decimator.worldSelectArrows != null) {
-				var46 = Login.xPadding + 280;
-				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) {
-					Decimator.worldSelectArrows[2].drawAt(var46, 4);
-				} else {
-					Decimator.worldSelectArrows[0].drawAt(var46, 4);
-				}
-
-				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) {
-					Decimator.worldSelectArrows[3].drawAt(var46 + 15, 4);
-				} else {
-					Decimator.worldSelectArrows[1].drawAt(var46 + 15, 4);
-				}
-
-				var0.draw("World", var46 + 32, 17, 16777215, -1);
-				var24 = Login.xPadding + 390;
-				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) {
-					Decimator.worldSelectArrows[2].drawAt(var24, 4);
-				} else {
-					Decimator.worldSelectArrows[0].drawAt(var24, 4);
-				}
-
-				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) {
-					Decimator.worldSelectArrows[3].drawAt(var24 + 15, 4);
-				} else {
-					Decimator.worldSelectArrows[1].drawAt(var24 + 15, 4);
-				}
-
-				var0.draw("Players", var24 + 32, 17, 16777215, -1);
-				var35 = Login.xPadding + 500;
-				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) {
-					Decimator.worldSelectArrows[2].drawAt(var35, 4);
-				} else {
-					Decimator.worldSelectArrows[0].drawAt(var35, 4);
-				}
-
-				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) {
-					Decimator.worldSelectArrows[3].drawAt(var35 + 15, 4);
-				} else {
-					Decimator.worldSelectArrows[1].drawAt(var35 + 15, 4);
-				}
-
-				var0.draw("Location", var35 + 32, 17, 16777215, -1);
-				var34 = Login.xPadding + 610;
-				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) {
-					Decimator.worldSelectArrows[2].drawAt(var34, 4);
-				} else {
-					Decimator.worldSelectArrows[0].drawAt(var34, 4);
-				}
-
-				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) {
-					Decimator.worldSelectArrows[3].drawAt(var34 + 15, 4);
-				} else {
-					Decimator.worldSelectArrows[1].drawAt(var34 + 15, 4);
-				}
-
-				var0.draw("Type", var34 + 32, 17, 16777215, -1);
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0);
-			var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1);
-			Login.hoveredWorldIndex = -1;
-			if (SoundCache.worldSelectBackSprites != null) {
-				var23 = 88;
-				byte var49 = 19;
-				var35 = 765 / (var23 + 1) - 1;
-				var34 = 480 / (var49 + 1);
-
-				int var38;
-				do {
-					var27 = var34;
-					var38 = var35;
-					if (var34 * (var35 - 1) >= World.World_count) {
-						--var35;
-					}
-
-					if (var35 * (var34 - 1) >= World.World_count) {
-						--var34;
-					}
-
-					if (var35 * (var34 - 1) >= World.World_count) {
-						--var34;
-					}
-				} while(var27 != var34 || var35 != var38);
-
-				var27 = (765 - var23 * var35) / (var35 + 1);
-				if (var27 > 5) {
-					var27 = 5;
-				}
-
-				var38 = (480 - var34 * var49) / (var34 + 1);
-				if (var38 > 5) {
-					var38 = 5;
-				}
-
-				int var37 = (765 - var35 * var23 - var27 * (var35 - 1)) / 2;
-				var39 = (480 - var49 * var34 - var38 * (var34 - 1)) / 2;
-				int var11 = (var34 + World.World_count - 1) / var34;
-				Login.worldSelectPagesCount = var11 - var35;
-				if (AbstractWorldMapIcon.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
-					AbstractWorldMapIcon.worldSelectLeftSprite.drawAt(8, class30.canvasHeight / 2 - AbstractWorldMapIcon.worldSelectLeftSprite.subHeight / 2);
-				}
-
-				if (ClanChat.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
-					ClanChat.worldSelectRightSprite.drawAt(KitDefinition.canvasWidth - ClanChat.worldSelectRightSprite.subWidth - 8, class30.canvasHeight / 2 - ClanChat.worldSelectRightSprite.subHeight / 2);
-				}
-
-				int var12 = var39 + 23;
-				int var40 = var37 + Login.xPadding;
-				int var41 = 0;
-				boolean var42 = false;
-				int var43 = Login.worldSelectPage;
-
-				int var17;
-				for (var17 = var34 * var43; var17 < World.World_count && var43 - Login.worldSelectPage < var35; ++var17) {
-					World var28 = ChatChannel.World_worlds[var17];
-					boolean var19 = true;
-					String var20 = Integer.toString(var28.population);
-					if (var28.population == -1) {
-						var20 = "OFF";
-						var19 = false;
-					} else if (var28.population > 1980) {
-						var20 = "FULL";
-						var19 = false;
-					}
-
-					int var22 = 0;
-					byte var21;
-					if (var28.isBeta()) {
-						if (var28.isMembersOnly()) {
-							var21 = 7;
-						} else {
-							var21 = 6;
-						}
-					} else if (var28.isDeadman()) {
-						var22 = 16711680;
-						if (var28.isMembersOnly()) {
-							var21 = 5;
-						} else {
-							var21 = 4;
-						}
-					} else if (var28.isPvp()) {
-						if (var28.isMembersOnly()) {
-							var21 = 3;
-						} else {
-							var21 = 2;
-						}
-					} else if (var28.isMembersOnly()) {
-						var21 = 1;
-					} else {
-						var21 = 0;
-					}
-
-					if (MouseHandler.MouseHandler_x >= var40 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var40 + var23 && MouseHandler.MouseHandler_y < var12 + var49 && var19) {
-						Login.hoveredWorldIndex = var17;
-						SoundCache.worldSelectBackSprites[var21].drawTransOverlayAt(var40, var12, 128, 16777215);
-						var42 = true;
-					} else {
-						SoundCache.worldSelectBackSprites[var21].drawAt(var40, var12);
-					}
-
-					if (class1.worldSelectFlagSprites != null) {
-						class1.worldSelectFlagSprites[(var28.isMembersOnly() ? 8 : 0) + var28.location].drawAt(var40 + 29, var12);
-					}
-
-					var0.drawCentered(Integer.toString(var28.id), var40 + 15, var49 / 2 + var12 + 5, var22, -1);
-					var1.drawCentered(var20, var40 + 60, var49 / 2 + var12 + 5, 268435455, -1);
-					var12 = var12 + var38 + var49;
-					++var41;
-					if (var41 >= var34) {
-						var12 = var39 + 23;
-						var40 = var40 + var23 + var27;
-						var41 = 0;
-						++var43;
-					}
-				}
-
-				if (var42) {
-					var17 = var1.stringWidth(ChatChannel.World_worlds[Login.hoveredWorldIndex].activity) + 6;
-					int var18 = var1.ascent + 8;
-					int var44 = MouseHandler.MouseHandler_y + 25;
-					if (var18 + var44 > 480) {
-						var44 = MouseHandler.MouseHandler_y - 25 - var18;
-					}
-
-					Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var18, 16777120);
-					Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var18, 0);
-					var1.drawCentered(ChatChannel.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var44 + var1.ascent + 4, 0, -1);
-				}
-			}
-
-			SpotAnimationDefinition.rasterProvider.drawFull(0, 0);
-		} else {
-			Login.leftTitleSprite.drawAt(Login.xPadding, 0);
-			Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
-			class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18);
-			if (Client.gameState == 0 || Client.gameState == 5) {
-				var23 = 20;
-				var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1);
-				var24 = 253 - var23;
-				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409);
-				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0);
-				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
-				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
-				var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1);
-			}
-
-			String var25;
-			String var26;
-			short var45;
-			short var47;
-			if (Client.gameState == 20) {
-				Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2);
-				var45 = 201;
-				var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0);
-				var46 = var45 + 15;
-				var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0);
-				var46 += 15;
-				var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0);
-				var46 += 15;
-				var46 += 7;
-				if (Login.loginIndex != 4) {
-					var0.draw("Login: ", Login.loginBoxX + 180 - 110, var46, 16777215, 0);
-					var47 = 200;
-					var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username;
-
-					for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(0, var26.length() - 1)) {
-					}
-
-					var0.draw(AbstractFont.escapeBrackets(var26), Login.loginBoxX + 180 - 70, var46, 16777215, 0);
-					var46 += 15;
-					var0.draw("Password: " + Huffman.method3903(Login.Login_password), Login.loginBoxX + 180 - 108, var46, 16777215, 0);
-					var46 += 15;
-				}
-			}
-
-			if (Client.gameState == 10 || Client.gameState == 11) {
-				Login.titleboxSprite.drawAt(Login.loginBoxX, 171);
-				short var5;
-				if (Login.loginIndex == 0) {
-					var45 = 251;
-					var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var45, 16776960, 0);
-					var46 = var45 + 30;
-					var24 = Login.loginBoxX + 180 - 80;
-					var5 = 291;
-					Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-					var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
-					var24 = Login.loginBoxX + 180 + 80;
-					Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-					var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
-				} else if (Login.loginIndex == 1) {
-					var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0);
-					var45 = 236;
-					var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0);
-					var46 = var45 + 15;
-					var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0);
-					var46 += 15;
-					var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0);
-					var46 += 15;
-					var24 = Login.loginBoxX + 180 - 80;
-					var5 = 321;
-					Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-					var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0);
-					var24 = Login.loginBoxX + 180 + 80;
-					Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-					var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0);
-				} else if (Login.loginIndex == 2) {
-					var45 = 201;
-					var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var45, 16776960, 0);
-					var46 = var45 + 15;
-					var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var46, 16776960, 0);
-					var46 += 15;
-					var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var46, 16776960, 0);
-					var46 += 15;
-					var46 += 7;
-					var0.draw("Login: ", Login.loginBoxCenter - 110, var46, 16777215, 0);
-					var47 = 200;
-					var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username;
-
-					for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(1)) {
-					}
-
-					var0.draw(AbstractFont.escapeBrackets(var26) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var46, 16777215, 0);
-					var46 += 15;
-					var0.draw("Password: " + Huffman.method3903(Login.Login_password) + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var46, 16777215, 0);
-					var46 += 15;
-					var45 = 277;
-					var27 = Login.loginBoxCenter + -117;
-					boolean var9 = Client.Login_isUsernameRemembered;
-					boolean var10 = Login.field1169;
-					IndexedSprite var31 = var9 ? (var10 ? class96.field1303 : Login.options_buttons_2Sprite) : (var10 ? class83.field1136 : Login.options_buttons_0Sprite);
-					var31.drawAt(var27, var45);
-					var27 = var27 + var31.subWidth + 5;
-					var1.draw("Remember username", var27, var45 + 13, 16776960, 0);
-					var27 = Login.loginBoxCenter + 24;
-					boolean var13 = GrandExchangeOffer.clientPreferences.hideUsername;
-					boolean var14 = Login.field1170;
-					IndexedSprite var32 = var13 ? (var14 ? class96.field1303 : Login.options_buttons_2Sprite) : (var14 ? class83.field1136 : Login.options_buttons_0Sprite);
-					var32.drawAt(var27, var45);
-					var27 = var27 + var32.subWidth + 5;
-					var1.draw("Hide username", var27, var45 + 13, 16776960, 0);
-					var46 = var45 + 15;
-					int var15 = Login.loginBoxCenter - 80;
-					short var16 = 321;
-					Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20);
-					var0.drawCentered("Login", var15, var16 + 5, 16777215, 0);
-					var15 = Login.loginBoxCenter + 80;
-					Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20);
-					var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0);
-					var45 = 357;
-					switch(Login.field1161) {
-					case 2:
-						DynamicObject.field1268 = "Having trouble logging in?";
-						break;
-					default:
-						DynamicObject.field1268 = "Can't login? Click here.";
-					}
-
-					Decimator.field1443 = new Bounds(Login.loginBoxCenter, var45, var1.stringWidth(DynamicObject.field1268), 11);
-					MusicPatchPcmStream.field2466 = new Bounds(Login.loginBoxCenter, var45, var1.stringWidth("Still having trouble logging in?"), 11);
-					var1.drawCentered(DynamicObject.field1268, Login.loginBoxCenter, var45, 16777215, 0);
-				} else if (Login.loginIndex == 3) {
-					var45 = 201;
-					var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var45, 16776960, 0);
-					var46 = var45 + 20;
-					var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var46, 16776960, 0);
-					var46 += 15;
-					var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var46, 16776960, 0);
-					var46 += 15;
-					var24 = Login.loginBoxX + 180;
-					var5 = 276;
-					Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-					var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0);
-					var24 = Login.loginBoxX + 180;
-					var5 = 326;
-					Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-					var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0);
-				} else {
-					short var8;
-					if (Login.loginIndex == 4) {
-						var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0);
-						var45 = 236;
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0);
-						var46 = var45 + 15;
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0);
-						var46 += 15;
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0);
-						var46 += 15;
-						var0.draw("PIN: " + Huffman.method3903(WorldMapSection1.otp) + (Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var46, 16777215, 0);
-						var46 -= 8;
-						var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var46, 16776960, 0);
-						var46 += 15;
-						var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var46, 16776960, 0);
-						var24 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15;
-						var35 = var46 - var0.ascent;
-						IndexedSprite var48;
-						if (Login.field1171) {
-							var48 = Login.options_buttons_2Sprite;
-						} else {
-							var48 = Login.options_buttons_0Sprite;
-						}
-
-						var48.drawAt(var24, var35);
-						var46 += 15;
-						var27 = Login.loginBoxX + 180 - 80;
-						var8 = 321;
-						Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20);
-						var0.drawCentered("Continue", var27, var8 + 5, 16777215, 0);
-						var27 = Login.loginBoxX + 180 + 80;
-						Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20);
-						var0.drawCentered("Cancel", var27, var8 + 5, 16777215, 0);
-						var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var8 + 36, 255, 0);
-					} else if (Login.loginIndex == 5) {
-						var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0);
-						var45 = 221;
-						var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0);
-						var46 = var45 + 15;
-						var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var46 += 14;
-						var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var46, 16777215, 0);
-						var47 = 174;
-						var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username;
-
-						for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(1)) {
-						}
-
-						var0.draw(AbstractFont.escapeBrackets(var26) + (Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var46, 16777215, 0);
-						var46 += 15;
-						var27 = Login.loginBoxX + 180 - 80;
-						var8 = 321;
-						Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20);
-						var0.drawCentered("Recover", var27, var8 + 5, 16777215, 0);
-						var27 = Login.loginBoxX + 180 + 80;
-						Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20);
-						var0.drawCentered("Back", var27, var8 + 5, 16777215, 0);
-						var8 = 356;
-						var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var8, 268435455, 0);
-					} else if (Login.loginIndex == 6) {
-						var45 = 201;
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0);
-						var46 = var45 + 15;
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var24 = Login.loginBoxX + 180;
-						var5 = 321;
-						Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-						var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-					} else if (Login.loginIndex == 7) {
-						var45 = 216;
-						var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var45, 16776960, 0);
-						var46 = var45 + 15;
-						var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var24 = Login.loginBoxX + 180 - 80;
-						var5 = 321;
-						Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-						var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0);
-						var24 = Login.loginBoxX + 180 + 80;
-						Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-						var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-					} else if (Login.loginIndex == 8) {
-						var45 = 216;
-						var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var45, 16776960, 0);
-						var46 = var45 + 15;
-						var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var24 = Login.loginBoxX + 180 - 80;
-						var5 = 321;
-						Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-						var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0);
-						var24 = Login.loginBoxX + 180 + 80;
-						Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-						var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-					} else if (Login.loginIndex == 12) {
-						var45 = 201;
-						String var4 = "";
-						var25 = "";
-						var26 = "";
-						switch(Login.field1160) {
-						case 0:
-							var4 = "Your account has been disabled.";
-							var25 = Strings.field2992;
-							var26 = "";
-							break;
-						case 1:
-							var4 = "Account locked as we suspect it has been stolen.";
-							var25 = Strings.field2831;
-							var26 = "";
-							break;
-						default:
-							GZipDecompressor.method6390(false);
-						}
-
-						var0.drawCentered(var4, Login.loginBoxX + 180, var45, 16776960, 0);
-						var46 = var45 + 15;
-						var2.drawCentered(var25, Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var2.drawCentered(var26, Login.loginBoxX + 180, var46, 16776960, 0);
-						var46 += 15;
-						var27 = Login.loginBoxX + 180;
-						var8 = 276;
-						Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20);
-						var0.drawCentered("Support Page", var27, var8 + 5, 16777215, 0);
-						var27 = Login.loginBoxX + 180;
-						var8 = 326;
-						Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20);
-						var0.drawCentered("Back", var27, var8 + 5, 16777215, 0);
-					} else if (Login.loginIndex == 24) {
-						var45 = 221;
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0);
-						var46 = var45 + 15;
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0);
-						var46 += 15;
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0);
-						var46 += 15;
-						var24 = Login.loginBoxX + 180;
-						var5 = 301;
-						Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-						var0.drawCentered("Ok", var24, var5 + 5, 16777215, 0);
-					}
-				}
-			}
-
-			if (Client.gameState >= 10) {
-				int[] var3 = new int[4];
-				Rasterizer2D.Rasterizer2D_getClipArray(var3);
-				Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class30.canvasHeight);
-				Bounds.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle);
-				Bounds.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle);
-				Rasterizer2D.Rasterizer2D_setClipArray(var3);
-			}
-
-			BoundaryObject.title_muteSprite[GrandExchangeOffer.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463);
-			if (Client.gameState > 5 && Language.Language_EN == class60.clientLanguage) {
-				if (class195.field2368 != null) {
-					var46 = Login.xPadding + 5;
-					var47 = 463;
-					byte var36 = 100;
-					byte var6 = 35;
-					class195.field2368.drawAt(var46, var47);
-					var0.drawCentered("World" + " " + Client.worldId, var36 / 2 + var46, var6 / 2 + var47 - 2, 16777215, 0);
-					if (IgnoreList.World_request != null) {
-						var1.drawCentered("Loading...", var36 / 2 + var46, var6 / 2 + var47 + 12, 16777215, 0);
-					} else {
-						var1.drawCentered("Click to switch", var36 / 2 + var46, var6 / 2 + var47 + 12, 16777215, 0);
-					}
-				} else {
-					class195.field2368 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "sl_button", "");
-				}
-			}
-
 		}
+
+		if (Client.meslayerContinueWidget != null) {
+			WorldMapID.invalidateWidget(Client.meslayerContinueWidget);
+			Client.meslayerContinueWidget = null;
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -4,26 +4,38 @@ import java.util.Comparator;
 import java.util.List;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("t")
+@ObfuscatedName("j")
@Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 1066542769
+	)
+	@Export("PcmPlayer_count")
+	static int PcmPlayer_count;
+	@ObfuscatedName("gd")
+	@ObfuscatedSignature(
+		signature = "[Lli;"
+	)
+	@Export("headIconHintSprites")
+	static Sprite[] headIconHintSprites;
+	@ObfuscatedName("c")
 	@Export("events")
 	public final List events;

@@ -36,7 +48,7 @@ public class GrandExchangeEvents {
 	}

 	@ObfuscatedSignature(
-		signature = "(Lky;Z)V",
+		signature = "(Lkz;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -58,10 +70,10 @@ public class GrandExchangeEvents {

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(Ljava/util/Comparator;ZB)V",
-		garbageValue = "64"
+		garbageValue = "0"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -73,50 +85,72 @@ public class GrandExchangeEvents {

 	}

-	@ObfuscatedName("l")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ILcr;ZS)I",
-		garbageValue = "-10184"
+		signature = "(Lhz;Lhz;ZLkf;B)V",
+		garbageValue = "118"
 	)
-	static int method84(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) {
-			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) {
-			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			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.IF_HASSUB) {
-			int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5);
-			if (var4 != null) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTOP) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface;
-			return 1;
-		} else {
-			return 2;
-		}
+	public static void method69(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) {
+		class65.ItemDefinition_archive = var0;
+		ItemDefinition.ItemDefinition_modelArchive = var1;
+		ItemDefinition.ItemDefinition_inMembersWorld = var2;
+		ItemDefinition.ItemDefinition_fileCount = class65.ItemDefinition_archive.getGroupFileCount(10);
+		class215.ItemDefinition_fontPlain11 = var3;
 	}

-	@ObfuscatedName("gc")
+	@ObfuscatedName("jp")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "0"
+		signature = "(I)V",
+		garbageValue = "2004785230"
 	)
-	static boolean method81() {
-		return (Client.drawPlayerNames & 1) != 0;
+	static final void method66() {
+		Client.field815 = Client.cycleCntr;
+	}
+
+	@ObfuscatedName("ko")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZB)Ljava/lang/String;",
+		garbageValue = "59"
+	)
+	static String method67(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 (WorldMapArea.field217 != null) {
+			var3 = "/p=" + WorldMapArea.field217;
+		}
+
+		String var4 = "runescape.com";
+		return var2 + var0 + "." + var4 + "/l=" + class43.clientLanguage + "/a=" + MouseRecorder.field565 + var3 + "/";
+	}
+
+	@ObfuscatedName("kq")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1862958560"
+	)
+	static String method68(String var0) {
+		PlayerType[] var1 = PlayerAppearance.PlayerType_values();
+
+		for (int var2 = 0; var2 < var1.length; ++var2) {
+			PlayerType var3 = var1[var2];
+			if (var3.modIcon != -1 && var0.startsWith(ArchiveDiskAction.method4133(var3.modIcon))) {
+				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
+				break;
+			}
+		}
+
+		return var0;
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOffer.java
+++ b/runescape-client/src/main/java/GrandExchangeOffer.java
@@ -5,51 +5,47 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("d")
+@ObfuscatedName("z")
@Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("st")
-	@ObfuscatedGetter(
-		intValue = 549974423
-	)
-	@Export("foundItemIndex")
-	static int foundItemIndex;
-	@ObfuscatedName("se")
+	@ObfuscatedName("d")
+	static int[] field67;
+	@ObfuscatedName("da")
 	@ObfuscatedSignature(
-		signature = "Lbx;"
+		signature = "Lio;"
 	)
-	@Export("clientPreferences")
-	static ClientPreferences clientPreferences;
-	@ObfuscatedName("s")
+	@Export("archive1")
+	static Archive archive1;
+	@ObfuscatedName("c")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 416922963
+		intValue = 742288721
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1858157699
+		intValue = -900885629
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -214524093
+		intValue = 915947343
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 280180281
+		intValue = -1696571551
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 24514895
+		intValue = 737013101
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -58,7 +54,7 @@ public class GrandExchangeOffer {
 	}

 	@ObfuscatedSignature(
-		signature = "(Lky;Z)V",
+		signature = "(Lkz;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -70,42 +66,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)I",
-		garbageValue = "-1032509365"
+		signature = "(B)I",
+		garbageValue = "1"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-636010194"
+		garbageValue = "639881605"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}

-	@ObfuscatedName("u")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1701823469"
+		garbageValue = "1620696399"
 	)
-	void method108(int var1) {
+	void method98(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-184114003"
+		garbageValue = "-417146285"
 	)
-	void method124(int var1) {
+	void method92(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -113,270 +109,203 @@ public class GrandExchangeOffer {

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;II)Z",
-		garbageValue = "-1475643333"
+		signature = "(ILcu;ZI)I",
+		garbageValue = "1743615056"
 	)
-	static boolean method109(String var0, int var1) {
-		return WorldMapSection0.method232(var0, var1, "openjs");
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(ILcr;ZB)I",
-		garbageValue = "5"
-	)
-	static int method123(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? class286.field3623 : class297.field3693;
-		}
-
-		FriendSystem.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 = WorldMapIcon_1.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 = WorldMapData_0.ItemDefinition_get(var4);
-			var3.modelAngleX = var6.xan2d;
-			var3.modelAngleY = var6.yan2d;
-			var3.modelAngleZ = var6.zan2d;
-			var3.modelOffsetX = var6.offsetX2d;
-			var3.modelOffsetY = var6.offsetY2d;
-			var3.modelZoom = var6.zoom2d;
-			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
-				var3.itemQuantityMode = 0;
-			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) {
-				var3.itemQuantityMode = 1;
-			} else {
-				var3.itemQuantityMode = 2;
-			}
-
-			if (var3.field2638 > 0) {
-				var3.modelZoom = var3.modelZoom * 32 / var3.field2638;
-			} else if (var3.rawWidth > 0) {
-				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
-			}
-
+	static int method103(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) {
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ClientPacket.loadWorlds() ? 1 : 0;
 			return 1;
-		}
-	}
-
-	@ObfuscatedName("hs")
-	@ObfuscatedSignature(
-		signature = "(ZLkx;B)V",
-		garbageValue = "104"
-	)
-	@Export("updateNpcs")
-	static final void updateNpcs(boolean var0, PacketBuffer var1) {
-		Client.field899 = 0;
-		Client.field861 = 0;
-		GrandExchangeOfferUnitPriceComparator.readNpcUpdates();
-		BoundaryObject.method3216(var0, var1);
-		method112(var1);
-
-		int var2;
-		for (var2 = 0; var2 < Client.field899; ++var2) {
-			int var3 = Client.field655[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("hj")
-	@ObfuscatedSignature(
-		signature = "(Lkx;I)V",
-		garbageValue = "494584381"
-	)
-	static final void method112(PacketBuffer var0) {
-		for (int var1 = 0; var1 < Client.field861; ++var1) {
-			int var2 = Client.field669[var1];
-			NPC var3 = Client.npcs[var2];
-			int var4 = var0.readUnsignedByte();
-			if ((var4 & 1) != 0) {
-				var3.targetIndex = var0.method5445();
-				if (var3.targetIndex == 65535) {
-					var3.targetIndex = -1;
-				}
-			}
-
-			int var5;
-			int var6;
-			int var7;
-			int var8;
-			if ((var4 & 64) != 0) {
-				var5 = var0.method5447();
-				var6 = var0.method5447();
-				var7 = var3.x - (var5 - PacketWriter.baseX * 64 - PacketWriter.baseX * 64) * 64;
-				var8 = var3.y - (var6 - RouteStrategy.baseY * 64 - RouteStrategy.baseY * 64) * 64;
-				if (var7 != 0 || var8 != 0) {
-					var3.field946 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
-				}
-			}
-
-			if ((var4 & 32) != 0) {
-				var5 = var0.readUnsignedShort();
-				if (var5 == 65535) {
-					var5 = -1;
+			World var3;
+			if (var0 == ScriptOpcodes.WORLDLIST_START) {
+				var3 = class185.worldListStart();
+				if (var3 != null) {
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.id;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.properties;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.activity;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.location;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.population;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.host;
+				} else {
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
 				}

-				var6 = var0.method5438();
-				if (var5 == var3.sequence && var5 != -1) {
-					var7 = Widget.SequenceDefinition_get(var5).field3492;
-					if (var7 == 1) {
-						var3.sequenceFrame = 0;
-						var3.sequenceFrameCycle = 0;
-						var3.sequenceDelay = var6;
-						var3.field964 = 0;
-					}
-
-					if (var7 == 2) {
-						var3.field964 = 0;
-					}
-				} else if (var5 == -1 || var3.sequence == -1 || Widget.SequenceDefinition_get(var5).field3508 >= Widget.SequenceDefinition_get(var3.sequence).field3508) {
-					var3.sequence = var5;
-					var3.sequenceFrame = 0;
-					var3.sequenceFrameCycle = 0;
-					var3.sequenceDelay = var6;
-					var3.field964 = 0;
-					var3.field947 = var3.pathLength;
-				}
-			}
-
-			if ((var4 & 4) != 0) {
-				var3.definition = ViewportMouse.getNpcDefinition(var0.readUnsignedShort());
-				var3.size = var3.definition.size * 64;
-				var3.field971 = var3.definition.rotation;
-				var3.walkSequence = var3.definition.walkSequence;
-				var3.walkBackSequence = var3.definition.walkBackSequence;
-				var3.walkLeftSequence = var3.definition.walkLeftSequence;
-				var3.walkRightSequence = var3.definition.walkRightSequence;
-				var3.readySequence = var3.definition.readySequence;
-				var3.turnLeftSequence = var3.definition.turnLeftSequence;
-				var3.turnRightSequence = var3.definition.turnRightSequence;
-			}
-
-			if ((var4 & 16) != 0) {
-				var5 = var0.readUnsignedByteNegate();
-				int var9;
-				int var10;
-				int var11;
-				if (var5 > 0) {
-					for (var6 = 0; var6 < var5; ++var6) {
-						var8 = -1;
-						var9 = -1;
-						var10 = -1;
-						var7 = var0.readUShortSmart();
-						if (var7 == 32767) {
-							var7 = var0.readUShortSmart();
-							var9 = var0.readUShortSmart();
-							var8 = var0.readUShortSmart();
-							var10 = var0.readUShortSmart();
-						} else if (var7 != 32766) {
-							var9 = var0.readUShortSmart();
-						} else {
-							var7 = -1;
-						}
-
-						var11 = var0.readUShortSmart();
-						var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
-					}
+				return 1;
+			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) {
+				var3 = Frames.getNextWorldListWorld();
+				if (var3 != null) {
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.id;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.properties;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.activity;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.location;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.population;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.host;
+				} else {
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
 				}

-				var6 = var0.method5436();
-				if (var6 > 0) {
-					for (var7 = 0; var7 < var6; ++var7) {
-						var8 = var0.readUShortSmart();
-						var9 = var0.readUShortSmart();
-						if (var9 != 32767) {
-							var10 = var0.readUShortSmart();
-							var11 = var0.readUnsignedByte();
-							int var12 = var9 > 0 ? var0.method5438() : var11;
-							var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
-						} else {
-							var3.removeHealthBar(var8);
+				return 1;
+			} else {
+				World var4;
+				int var5;
+				int var7;
+				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) {
+					var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+					var4 = null;
+
+					for (var5 = 0; var5 < World.World_count; ++var5) {
+						if (var7 == World.World_worlds[var5].id) {
+							var4 = World.World_worlds[var5];
+							break;
 						}
 					}
-				}
-			}

-			if ((var4 & 8) != 0) {
-				var3.spotAnimation = var0.method5445();
-				var5 = var0.method5455();
-				var3.heightOffset = var5 >> 16;
-				var3.field958 = (var5 & 65535) + Client.cycle;
-				var3.spotAnimationFrame = 0;
-				var3.spotAnimationFrameCycle = 0;
-				if (var3.field958 > Client.cycle) {
-					var3.spotAnimationFrame = -1;
-				}
+					if (var4 != null) {
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.id;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.properties;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.activity;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.location;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.population;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.host;
+					} else {
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+					}

-				if (var3.spotAnimation == 65535) {
-					var3.spotAnimation = -1;
-				}
-			}
+					return 1;
+				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) {
+					class160.Interpreter_intStackSize -= 4;
+					var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+					boolean var10 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1;
+					var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
+					boolean var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3] == 1;
+					WorldMapID.sortWorldList(var7, var10, var5, var6);
+					return 1;
+				} else if (var0 != ScriptOpcodes.GETWORLDINFO) {
+					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {
+						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
+						return 1;
+					} else {
+						int var8;
+						ParamDefinition var9;
+						if (var0 == ScriptOpcodes.NC_PARAM) {
+							class160.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = FontName.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = FontName.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt);
+							}

-			if ((var4 & 2) != 0) {
-				var3.overheadText = var0.readStringCp1252NullTerminated();
-				var3.overheadTextCyclesRemaining = 100;
+							return 1;
+						} else if (var0 == ScriptOpcodes.LC_PARAM) {
+							class160.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = WallDecoration.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WallDecoration.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.OC_PARAM) {
+							class160.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = Player.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Player.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) {
+							class160.Interpreter_intStackSize -= 2;
+							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
+							if (var9.isString()) {
+								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = class225.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr);
+							} else {
+								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class225.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt);
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.ON_MOBILE) {
+							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CLIENTTYPE) {
+							Interpreter.Interpreter_intStack[++class160.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) {
+							--TextureProvider.Interpreter_stringStackSize;
+							--class160.Interpreter_intStackSize;
+							return 1;
+						} else if (var0 == 6523) {
+							--TextureProvider.Interpreter_stringStackSize;
+							--class160.Interpreter_intStackSize;
+							return 1;
+						} else if (var0 == ScriptOpcodes.BATTERYLEVEL) {
+							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+							return 1;
+						} else if (var0 == ScriptOpcodes.BATTERYCHARGING) {
+							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1;
+							return 1;
+						} else if (var0 == ScriptOpcodes.WIFIAVAILABLE) {
+							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1;
+							return 1;
+						} else {
+							return 2;
+						}
+					}
+				} else {
+					var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+					if (var7 >= 0 && var7 < World.World_count) {
+						var4 = World.World_worlds[var7];
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.id;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.properties;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.activity;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.location;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.population;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.host;
+					} else {
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				}
 			}
 		}
-
-	}
-
-	@ObfuscatedName("li")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "869899201"
-	)
-	static void method122() {
-		if (Client.field706 && WorldMapIcon_1.localPlayer != null) {
-			int var0 = WorldMapIcon_1.localPlayer.pathX[0];
-			int var1 = WorldMapIcon_1.localPlayer.pathY[0];
-			if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) {
-				return;
-			}
-
-			DynamicObject.oculusOrbFocalPointX = WorldMapIcon_1.localPlayer.x;
-			int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - Client.camFollowHeight;
-			if (var2 < ScriptEvent.field559) {
-				ScriptEvent.field559 = var2;
-			}
-
-			FriendSystem.oculusOrbFocalPointY = WorldMapIcon_1.localPlayer.y;
-			Client.field706 = false;
-		}
-
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
@@ -4,150 +4,43 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("r")
+@ObfuscatedName("f")
@Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("s")
+	@ObfuscatedName("gj")
+	@Export("xteaKeys")
+	static int[][] xteaKeys;
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lq;Lq;B)I",
-		garbageValue = "-1"
+		signature = "(Lv;Lv;I)I",
+		garbageValue = "-231146255"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1);
 	}

-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}

-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
-		garbageValue = "125"
-	)
-	static void method156(int var0, int var1, int var2, int var3) {
-		for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-			if (var4.soundEffectId != -1 || var4.soundEffectIds != null) {
-				int var5 = 0;
-				if (var1 > var4.field1052 * 16384) {
-					var5 += var1 - var4.field1052 * 16384;
-				} else if (var1 < var4.x * 16384) {
-					var5 += var4.x * 16384 - var1;
-				}
-
-				if (var2 > var4.field1053 * 16384) {
-					var5 += var2 - var4.field1053 * 16384;
-				} else if (var2 < var4.y * 16384) {
-					var5 += var4.y * 16384 - var2;
-				}
-
-				if (var5 - 64 <= var4.field1054 && Client.field860 != 0 && var0 == var4.plane) {
-					var5 -= 64;
-					if (var5 < 0) {
-						var5 = 0;
-					}
-
-					int var6 = (var4.field1054 - var5) * Client.field860 / var4.field1054;
-					if (var4.stream1 == null) {
-						if (var4.soundEffectId >= 0) {
-							SoundEffect var7 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectId, 0);
-							if (var7 != null) {
-								RawSound var8 = var7.toRawSound().resample(class247.decimator);
-								RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6);
-								var9.setNumLoops(-1);
-								IgnoreList.pcmStreamMixer.addSubStream(var9);
-								var4.stream1 = var9;
-							}
-						}
-					} else {
-						var4.stream1.method2599(var6);
-					}
-
-					if (var4.stream2 == null) {
-						if (var4.soundEffectIds != null && (var4.field1056 -= var3) <= 0) {
-							int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length);
-							SoundEffect var12 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectIds[var11], 0);
-							if (var12 != null) {
-								RawSound var13 = var12.toRawSound().resample(class247.decimator);
-								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6);
-								var10.setNumLoops(0);
-								IgnoreList.pcmStreamMixer.addSubStream(var10);
-								var4.stream2 = var10;
-								var4.field1056 = var4.field1057 + (int)(Math.random() * (double)(var4.field1058 - var4.field1057));
-							}
-						}
-					} else {
-						var4.stream2.method2599(var6);
-						if (!var4.stream2.hasNext()) {
-							var4.stream2 = null;
-						}
-					}
-				} else {
-					if (var4.stream1 != null) {
-						IgnoreList.pcmStreamMixer.removeSubStream(var4.stream1);
-						var4.stream1 = null;
-					}
-
-					if (var4.stream2 != null) {
-						IgnoreList.pcmStreamMixer.removeSubStream(var4.stream2);
-						var4.stream2 = null;
-					}
-				}
-			}
-		}
-
+	public boolean equals(Object var1) {
+		return super.equals(var1);
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1443594244"
+		signature = "(Lhy;IIII)V",
+		garbageValue = "-1708148250"
 	)
-	@Export("savePreferences")
-	static void savePreferences() {
-		AccessFile var0 = null;
-
-		try {
-			var0 = TaskHandler.getPreferencesFile("", WorldMapRectangle.field166.name, true);
-			Buffer var1 = GrandExchangeOffer.clientPreferences.toBuffer();
-			var0.write(var1.array, 0, var1.offset);
-		} catch (Exception var3) {
+	@Export("Widget_setKeyRate")
+	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		if (var0.field2615 == null) {
+			throw new RuntimeException();
+		} else {
+			var0.field2615[var1] = var2;
+			var0.field2616[var1] = var3;
 		}
-
-		try {
-			if (var0 != null) {
-				var0.closeSync(true);
-			}
-		} catch (Exception var2) {
-		}
-
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(I)Lbl;",
-		garbageValue = "-1436154979"
-	)
-	@Export("getNextWorldListWorld")
-	static World getNextWorldListWorld() {
-		return World.World_listCount < World.World_count ? ChatChannel.World_worlds[++World.World_listCount - 1] : null;
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "4"
-	)
-	@Export("Widget_clearCached")
-	public static void Widget_clearCached() {
-		Widget.Widget_cachedSprites.clear();
-		Widget.Widget_cachedModels.clear();
-		Widget.Widget_cachedFonts.clear();
-		Widget.Widget_cachedSpriteMasks.clear();
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
@@ -1,450 +1,73 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("c")
+@ObfuscatedName("h")
@Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("s")
+	@ObfuscatedName("ne")
+	@ObfuscatedGetter(
+		intValue = 1296404691
+	)
+	static int field79;
+	@ObfuscatedName("sp")
+	@ObfuscatedGetter(
+		intValue = -1426574287
+	)
+	@Export("foundItemIdCount")
+	static int foundItemIdCount;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lq;Lq;B)I",
-		garbageValue = "68"
+		signature = "Lhz;"
+	)
+	@Export("ObjectDefinition_archive")
+	public static AbstractArchive ObjectDefinition_archive;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(Lv;Lv;I)I",
+		garbageValue = "576633421"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.getOfferName().compareTo(var2.getOfferName());
 	}

-	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("an")
-	@ObfuscatedSignature(
-		signature = "(ILcr;ZB)I",
-		garbageValue = "68"
-	)
-	static int method150(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
-			Interpreter.Interpreter_intStackSize -= 3;
-			Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			WorldMapIcon_0.privateChatMode = class270.method4895(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-			if (WorldMapIcon_0.privateChatMode == null) {
-				WorldMapIcon_0.privateChatMode = PrivateChatMode.field3788;
-			}
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}

-			Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-			PacketBufferNode var18 = MenuAction.getPacketBufferNode(ClientPacket.field2200, Client.packetWriter.isaacCipher);
-			var18.packetBuffer.writeByte(Client.publicChatMode);
-			var18.packetBuffer.writeByte(WorldMapIcon_0.privateChatMode.field3791);
-			var18.packetBuffer.writeByte(Client.tradeChatMode);
-			Client.packetWriter.addNode(var18);
-			return 1;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)[Llt;",
+		garbageValue = "-527219234"
+	)
+	public static IndexedSprite[] method122(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1);
+		int var4 = var0.getFileId(var3, var2);
+		byte[] var7 = var0.takeFile(var3, var4);
+		boolean var6;
+		if (var7 == null) {
+			var6 = false;
 		} else {
-			String var3;
-			int var4;
-			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
-				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-				Interpreter.Interpreter_intStackSize -= 2;
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher);
-				var6.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var3) + 2);
-				var6.packetBuffer.writeStringCp1252NullTerminated(var3);
-				var6.packetBuffer.writeByte(var4 - 1);
-				var6.packetBuffer.writeByte(var5);
-				Client.packetWriter.addNode(var6);
-				return 1;
-			} else {
-				int var10;
-				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
-					Interpreter.Interpreter_intStackSize -= 2;
-					var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					Message var15 = FileSystem.Messages_getByChannelAndID(var10, var4);
-					if (var15 != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.count;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.cycle;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
-					var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					Message var16 = class227.Messages_getMessage(var10);
-					if (var16 != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.type;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
-					if (WorldMapIcon_0.privateChatMode == null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapIcon_0.privateChatMode.field3791;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
-					var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-					var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					String var14 = var3.toLowerCase();
-					byte var17 = 0;
-					if (var14.startsWith("yellow:")) {
-						var17 = 0;
-						var3 = var3.substring("yellow:".length());
-					} else if (var14.startsWith("red:")) {
-						var17 = 1;
-						var3 = var3.substring("red:".length());
-					} else if (var14.startsWith("green:")) {
-						var17 = 2;
-						var3 = var3.substring("green:".length());
-					} else if (var14.startsWith("cyan:")) {
-						var17 = 3;
-						var3 = var3.substring("cyan:".length());
-					} else if (var14.startsWith("purple:")) {
-						var17 = 4;
-						var3 = var3.substring("purple:".length());
-					} else if (var14.startsWith("white:")) {
-						var17 = 5;
-						var3 = var3.substring("white:".length());
-					} else if (var14.startsWith("flash1:")) {
-						var17 = 6;
-						var3 = var3.substring("flash1:".length());
-					} else if (var14.startsWith("flash2:")) {
-						var17 = 7;
-						var3 = var3.substring("flash2:".length());
-					} else if (var14.startsWith("flash3:")) {
-						var17 = 8;
-						var3 = var3.substring("flash3:".length());
-					} else if (var14.startsWith("glow1:")) {
-						var17 = 9;
-						var3 = var3.substring("glow1:".length());
-					} else if (var14.startsWith("glow2:")) {
-						var17 = 10;
-						var3 = var3.substring("glow2:".length());
-					} else if (var14.startsWith("glow3:")) {
-						var17 = 11;
-						var3 = var3.substring("glow3:".length());
-					} else if (class60.clientLanguage != Language.Language_EN) {
-						if (var14.startsWith("yellow:")) {
-							var17 = 0;
-							var3 = var3.substring("yellow:".length());
-						} else if (var14.startsWith("red:")) {
-							var17 = 1;
-							var3 = var3.substring("red:".length());
-						} else if (var14.startsWith("green:")) {
-							var17 = 2;
-							var3 = var3.substring("green:".length());
-						} else if (var14.startsWith("cyan:")) {
-							var17 = 3;
-							var3 = var3.substring("cyan:".length());
-						} else if (var14.startsWith("purple:")) {
-							var17 = 4;
-							var3 = var3.substring("purple:".length());
-						} else if (var14.startsWith("white:")) {
-							var17 = 5;
-							var3 = var3.substring("white:".length());
-						} else if (var14.startsWith("flash1:")) {
-							var17 = 6;
-							var3 = var3.substring("flash1:".length());
-						} else if (var14.startsWith("flash2:")) {
-							var17 = 7;
-							var3 = var3.substring("flash2:".length());
-						} else if (var14.startsWith("flash3:")) {
-							var17 = 8;
-							var3 = var3.substring("flash3:".length());
-						} else if (var14.startsWith("glow1:")) {
-							var17 = 9;
-							var3 = var3.substring("glow1:".length());
-						} else if (var14.startsWith("glow2:")) {
-							var17 = 10;
-							var3 = var3.substring("glow2:".length());
-						} else if (var14.startsWith("glow3:")) {
-							var17 = 11;
-							var3 = var3.substring("glow3:".length());
-						}
-					}
-
-					var14 = var3.toLowerCase();
-					byte var7 = 0;
-					if (var14.startsWith("wave:")) {
-						var7 = 1;
-						var3 = var3.substring("wave:".length());
-					} else if (var14.startsWith("wave2:")) {
-						var7 = 2;
-						var3 = var3.substring("wave2:".length());
-					} else if (var14.startsWith("shake:")) {
-						var7 = 3;
-						var3 = var3.substring("shake:".length());
-					} else if (var14.startsWith("scroll:")) {
-						var7 = 4;
-						var3 = var3.substring("scroll:".length());
-					} else if (var14.startsWith("slide:")) {
-						var7 = 5;
-						var3 = var3.substring("slide:".length());
-					} else if (Language.Language_EN != class60.clientLanguage) {
-						if (var14.startsWith("wave:")) {
-							var7 = 1;
-							var3 = var3.substring("wave:".length());
-						} else if (var14.startsWith("wave2:")) {
-							var7 = 2;
-							var3 = var3.substring("wave2:".length());
-						} else if (var14.startsWith("shake:")) {
-							var7 = 3;
-							var3 = var3.substring("shake:".length());
-						} else if (var14.startsWith("scroll:")) {
-							var7 = 4;
-							var3 = var3.substring("scroll:".length());
-						} else if (var14.startsWith("slide:")) {
-							var7 = 5;
-							var3 = var3.substring("slide:".length());
-						}
-					}
-
-					PacketBufferNode var8 = MenuAction.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.writeByte(0);
-					int var9 = var8.packetBuffer.offset;
-					var8.packetBuffer.writeByte(var4);
-					var8.packetBuffer.writeByte(var17);
-					var8.packetBuffer.writeByte(var7);
-					SpotAnimationDefinition.method4334(var8.packetBuffer, var3);
-					var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
-					Client.packetWriter.addNode(var8);
-					return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
-					Interpreter.Interpreter_stringStackSize -= 2;
-					var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-					String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-					PacketBufferNode var11 = MenuAction.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher);
-					var11.packetBuffer.writeShort(0);
-					int var13 = var11.packetBuffer.offset;
-					var11.packetBuffer.writeStringCp1252NullTerminated(var3);
-					SpotAnimationDefinition.method4334(var11.packetBuffer, var12);
-					var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
-					Client.packetWriter.addNode(var11);
-					return 1;
-				} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
-					if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode;
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.Messages_getHistorySize(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FaceNormal.Messages_getNextChatID(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.Messages_getLastChatID(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.DOCHEAT) {
-						var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-						BuddyRankComparator.doCheat(var3);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
-						Client.field668 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field668;
-						return 1;
-					} else if (var0 == 5023) {
-						var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-						System.out.println(var3);
-						return 1;
-					} else {
-						return 2;
-					}
-				} else {
-					if (WorldMapIcon_1.localPlayer != null && WorldMapIcon_1.localPlayer.username != null) {
-						var3 = WorldMapIcon_1.localPlayer.username.getName();
-					} else {
-						var3 = "";
-					}
-
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
-					return 1;
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("fl")
-	@ObfuscatedSignature(
-		signature = "(Lbu;S)V",
-		garbageValue = "134"
-	)
-	static final void method149(Actor var0) {
-		var0.isWalking = false;
-		SequenceDefinition var1;
-		if (var0.movementSequence != -1) {
-			var1 = Widget.SequenceDefinition_get(var0.movementSequence);
-			if (var1 != null && var1.frameIds != null) {
-				++var0.movementFrameCycle;
-				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
-					var0.movementFrameCycle = 1;
-					++var0.movementFrame;
-					class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y);
-				}
-
-				if (var0.movementFrame >= var1.frameIds.length) {
-					var0.movementFrameCycle = 0;
-					var0.movementFrame = 0;
-					class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y);
-				}
-			} else {
-				var0.movementSequence = -1;
-			}
+			GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7);
+			var6 = true;
 		}

-		if (var0.spotAnimation != -1 && Client.cycle >= var0.field958) {
-			if (var0.spotAnimationFrame < 0) {
-				var0.spotAnimationFrame = 0;
-			}
-
-			int var3 = HealthBarUpdate.SpotAnimationDefinition_get(var0.spotAnimation).sequence;
-			if (var3 != -1) {
-				SequenceDefinition var2 = Widget.SequenceDefinition_get(var3);
-				if (var2 != null && var2.frameIds != null) {
-					++var0.spotAnimationFrameCycle;
-					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
-						var0.spotAnimationFrameCycle = 1;
-						++var0.spotAnimationFrame;
-						class325.addSequenceSoundEffect(var2, var0.spotAnimationFrame, var0.x, var0.y);
-					}
-
-					if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
-						var0.spotAnimation = -1;
-					}
-				} else {
-					var0.spotAnimation = -1;
-				}
-			} else {
-				var0.spotAnimation = -1;
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
-			var1 = Widget.SequenceDefinition_get(var0.sequence);
-			if (var1.field3506 == 1 && var0.field947 > 0 && var0.field941 <= Client.cycle && var0.field965 < Client.cycle) {
-				var0.sequenceDelay = 1;
-				return;
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay == 0) {
-			var1 = Widget.SequenceDefinition_get(var0.sequence);
-			if (var1 != null && var1.frameIds != null) {
-				++var0.sequenceFrameCycle;
-				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
-					var0.sequenceFrameCycle = 1;
-					++var0.sequenceFrame;
-					class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y);
-				}
-
-				if (var0.sequenceFrame >= var1.frameIds.length) {
-					var0.sequenceFrame -= var1.frameCount;
-					++var0.field964;
-					if (var0.field964 >= var1.field3502) {
-						var0.sequence = -1;
-					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
-						class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y);
-					} else {
-						var0.sequence = -1;
-					}
-				}
-
-				var0.isWalking = var1.field3501;
-			} else {
-				var0.sequence = -1;
-			}
-		}
-
-		if (var0.sequenceDelay > 0) {
-			--var0.sequenceDelay;
-		}
-
-	}
-
-	@ObfuscatedName("hh")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1895114197"
-	)
-	@Export("calculateMenuBounds")
-	static void calculateMenuBounds() {
-		WorldMapData_1.calculateMenuBounds(World.menuWidth / 2 + MilliClock.menuX, class96.menuY);
-	}
-
-	@ObfuscatedName("iu")
-	@ObfuscatedSignature(
-		signature = "(IIIZI)V",
-		garbageValue = "1199898430"
-	)
-	@Export("resizeComponents")
-	static final void resizeComponents(int var0, int var1, int var2, boolean var3) {
-		if (Projectile.loadInterface(var0)) {
-			ItemContainer.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3);
-		}
-	}
-
-	@ObfuscatedName("kc")
-	@ObfuscatedSignature(
-		signature = "(IIIILls;Lhg;I)V",
-		garbageValue = "1652604393"
-	)
-	@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;
-			UserComparator3.redHintArrowSprite.method6022(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
+		IndexedSprite[] var5;
+		if (!var6) {
+			var5 = null;
 		} else {
-			class191.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
+			var5 = FileSystem.method3489();
 		}

+		return var5;
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
@@ -4,26 +4,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("br")
+@ObfuscatedName("bh")
@Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("gd")
+	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
-		signature = "[Llq;"
+		signature = "Lfc;"
 	)
-	@Export("mapSceneSprites")
-	static IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("s")
+	@Export("js5SocketTask")
+	static Task js5SocketTask;
+	@ObfuscatedName("c")
 	@Export("filterWorlds")
 	boolean filterWorlds;

 	GrandExchangeOfferOwnWorldComparator() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lq;Lq;I)I",
-		garbageValue = "-1137362043"
+		signature = "(Lv;Lv;S)I",
+		garbageValue = "27782"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -44,119 +44,78 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 		}
 	}

-	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("d")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "1333427398"
-	)
-	@Export("setLoginResponseString")
-	static void setLoginResponseString(String var0, String var1, String var2) {
-		Login.Login_response1 = var0;
-		Login.Login_response2 = var1;
-		Login.Login_response3 = var2;
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}

-	@ObfuscatedName("ev")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
-		garbageValue = "-84"
+		signature = "([BIIII[Lfj;I)V",
+		garbageValue = "-1084526407"
 	)
-	@Export("getLoginError")
-	static void getLoginError(int var0) {
-		if (var0 == -3) {
-			setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
-		} else if (var0 == -2) {
-			setLoginResponseString("", "Error connecting to server.", "");
-		} else if (var0 == -1) {
-			setLoginResponseString("No response from server.", "Please try using a different world.", "");
-		} else if (var0 == 3) {
-			Login.loginIndex = 3;
-			Login.field1161 = 1;
-		} else if (var0 == 4) {
-			Login.loginIndex = 12;
-			Login.field1160 = 0;
-		} else if (var0 == 5) {
-			Login.field1161 = 2;
-			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) {
-			setLoginResponseString("RuneScape has been updated!", "Please reload this page.", "");
-		} else if (var0 == 7) {
-			setLoginResponseString("This world is full.", "Please use a different world.", "");
-		} else if (var0 == 8) {
-			setLoginResponseString("Unable to connect.", "Login server offline.", "");
-		} else if (var0 == 9) {
-			setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
-		} else if (var0 == 10) {
-			setLoginResponseString("Unable to connect.", "Bad session id.", "");
-		} else if (var0 == 11) {
-			setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
-		} else if (var0 == 12) {
-			setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
-		} else if (var0 == 13) {
-			setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
-		} else if (var0 == 14) {
-			setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
-		} else if (var0 == 16) {
-			setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
-		} else if (var0 == 17) {
-			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.field1160 = 1;
-		} else if (var0 == 19) {
-			setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
-		} else if (var0 == 20) {
-			setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
-		} else if (var0 == 22) {
-			setLoginResponseString("Malformed login packet.", "Please try again.", "");
-		} else if (var0 == 23) {
-			setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
-		} else if (var0 == 24) {
-			setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
-		} else if (var0 == 25) {
-			setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
-		} else if (var0 == 26) {
-			setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
-		} else if (var0 == 27) {
-			setLoginResponseString("", "Service unavailable.", "");
-		} else if (var0 == 31) {
-			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) {
-			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) {
-			setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
-		} else if (var0 == 38) {
-			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) {
-				setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", "");
-				FloorDecoration.updateGameState(11);
-				return;
-			}
-
-			if (var0 == 57) {
-				setLoginResponseString("The code you entered was incorrect.", "Please try again.", "");
-				FloorDecoration.updateGameState(11);
-				return;
-			}
-
-			if (var0 == 61) {
-				Login.loginIndex = 7;
-			} else {
-				setLoginResponseString("Unexpected server response", "Please try using a different world.", "");
+	static final void method1244(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+		int var7;
+		int var8;
+		for (int var6 = 0; var6 < 4; ++var6) {
+			for (var7 = 0; var7 < 64; ++var7) {
+				for (var8 = 0; var8 < 64; ++var8) {
+					if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) {
+						int[] var10000 = var5[var6].flags[var7 + var1];
+						var10000[var8 + var2] &= -16777217;
+					}
+				}
 			}
 		}

-		FloorDecoration.updateGameState(10);
+		Buffer var10 = new Buffer(var0);
+
+		for (var7 = 0; var7 < 4; ++var7) {
+			for (var8 = 0; var8 < 64; ++var8) {
+				for (int var9 = 0; var9 < 64; ++var9) {
+					class32.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0);
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(II)I",
+		garbageValue = "1688016819"
+	)
+	@Export("Messages_getLastChatID")
+	static int Messages_getLastChatID(int var0) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
+		if (var1 == null) {
+			return -1;
+		} else {
+			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
+		}
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-325368382"
+	)
+	static void method1232() {
+		Login.worldSelectOpen = false;
+		Login.leftTitleSprite.drawAt(Login.xPadding, 0);
+		class191.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+		HealthBar.logoSprite.drawAt(Login.xPadding + 382 - HealthBar.logoSprite.subWidth / 2, 18);
+	}
+
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "1088235300"
+	)
+	public static int method1245(String var0) {
+		return var0.length() + 2;
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
@@ -1,3 +1,4 @@
+import java.lang.management.GarbageCollectorMXBean;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
@@ -5,568 +6,57 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("x")
+@ObfuscatedName("d")
@Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "Lhz;"
-	)
-	@Export("HitSplatDefinition_spritesArchive")
-	public static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("ep")
+	@ObfuscatedName("ac")
+	@Export("garbageCollector")
+	static GarbageCollectorMXBean garbageCollector;
+	@ObfuscatedName("hy")
 	@ObfuscatedGetter(
-		intValue = 349503159
+		intValue = -1848118147
 	)
-	static int field59;
+	@Export("cameraY")
+	static int cameraY;

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lq;Lq;I)I",
-		garbageValue = "-1907717670"
+		signature = "(Lv;Lv;I)I",
+		garbageValue = "1419484112"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1);
 	}

-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}

-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(Lea;[Lfm;I)V",
-		garbageValue = "-207613599"
-	)
-	static final void method98(Scene var0, CollisionMap[] var1) {
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		for (var2 = 0; var2 < 4; ++var2) {
-			for (var3 = 0; var3 < 104; ++var3) {
-				for (var4 = 0; var4 < 104; ++var4) {
-					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) {
-						var5 = var2;
-						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
-							var5 = var2 - 1;
-						}
-
-						if (var5 >= 0) {
-							var1[var5].setBlockedByFloor(var3, var4);
-						}
-					}
-				}
-			}
-		}
-
-		Tiles.field477 += (int)(Math.random() * 5.0D) - 2;
-		if (Tiles.field477 < -8) {
-			Tiles.field477 = -8;
-		}
-
-		if (Tiles.field477 > 8) {
-			Tiles.field477 = 8;
-		}
-
-		Tiles.field486 += (int)(Math.random() * 5.0D) - 2;
-		if (Tiles.field486 < -16) {
-			Tiles.field486 = -16;
-		}
-
-		if (Tiles.field486 > 16) {
-			Tiles.field486 = 16;
-		}
-
-		int var9;
-		int var10;
-		int var11;
-		int var12;
-		int var13;
-		int var14;
-		int var15;
-		int var16;
-		int[] var10000;
-		int var17;
-		int var18;
-		for (var2 = 0; var2 < 4; ++var2) {
-			byte[][] var44 = class188.field2321[var2];
-			var9 = (int)Math.sqrt(5100.0D);
-			var10 = var9 * 768 >> 8;
-
-			int var19;
-			int var20;
-			for (var11 = 1; var11 < 103; ++var11) {
-				for (var12 = 1; var12 < 103; ++var12) {
-					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11];
-					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1];
-					var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536));
-					var16 = (var13 << 8) / var15;
-					var17 = 65536 / var15;
-					var18 = (var14 << 8) / var15;
-					var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96;
-					var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1);
-					class4.field31[var12][var11] = var19 - var20;
-				}
-			}
-
-			for (var11 = 0; var11 < 104; ++var11) {
-				Tiles.Tiles_hue[var11] = 0;
-				class3.Tiles_saturation[var11] = 0;
-				Buddy.Tiles_lightness[var11] = 0;
-				class49.Tiles_hueMultiplier[var11] = 0;
-				MenuAction.field1129[var11] = 0;
-			}
-
-			for (var11 = -5; var11 < 109; ++var11) {
-				for (var12 = 0; var12 < 104; ++var12) {
-					var13 = var11 + 5;
-					int var10002;
-					if (var13 >= 0 && var13 < 104) {
-						var14 = Tiles.field485[var2][var13][var12] & 255;
-						if (var14 > 0) {
-							FloorUnderlayDefinition var45 = StudioGame.FloorUnderlayDefinition_get(var14 - 1);
-							var10000 = Tiles.Tiles_hue;
-							var10000[var12] += var45.hue;
-							var10000 = class3.Tiles_saturation;
-							var10000[var12] += var45.saturation;
-							var10000 = Buddy.Tiles_lightness;
-							var10000[var12] += var45.lightness;
-							var10000 = class49.Tiles_hueMultiplier;
-							var10000[var12] += var45.hueMultiplier;
-							var10002 = MenuAction.field1129[var12]++;
-						}
-					}
-
-					var14 = var11 - 5;
-					if (var14 >= 0 && var14 < 104) {
-						var15 = Tiles.field485[var2][var14][var12] & 255;
-						if (var15 > 0) {
-							FloorUnderlayDefinition var46 = StudioGame.FloorUnderlayDefinition_get(var15 - 1);
-							var10000 = Tiles.Tiles_hue;
-							var10000[var12] -= var46.hue;
-							var10000 = class3.Tiles_saturation;
-							var10000[var12] -= var46.saturation;
-							var10000 = Buddy.Tiles_lightness;
-							var10000[var12] -= var46.lightness;
-							var10000 = class49.Tiles_hueMultiplier;
-							var10000[var12] -= var46.hueMultiplier;
-							var10002 = MenuAction.field1129[var12]--;
-						}
-					}
-				}
-
-				if (var11 >= 1 && var11 < 103) {
-					var12 = 0;
-					var13 = 0;
-					var14 = 0;
-					var15 = 0;
-					var16 = 0;
-
-					for (var17 = -5; var17 < 109; ++var17) {
-						var18 = var17 + 5;
-						if (var18 >= 0 && var18 < 104) {
-							var12 += Tiles.Tiles_hue[var18];
-							var13 += class3.Tiles_saturation[var18];
-							var14 += Buddy.Tiles_lightness[var18];
-							var15 += class49.Tiles_hueMultiplier[var18];
-							var16 += MenuAction.field1129[var18];
-						}
-
-						var19 = var17 - 5;
-						if (var19 >= 0 && var19 < 104) {
-							var12 -= Tiles.Tiles_hue[var19];
-							var13 -= class3.Tiles_saturation[var19];
-							var14 -= Buddy.Tiles_lightness[var19];
-							var15 -= class49.Tiles_hueMultiplier[var19];
-							var16 -= MenuAction.field1129[var19];
-						}
-
-						if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) {
-							if (var2 < Tiles.Tiles_minPlane) {
-								Tiles.Tiles_minPlane = var2;
-							}
-
-							var20 = Tiles.field485[var2][var11][var17] & 255;
-							int var21 = AccessFile.field4061[var2][var11][var17] & 255;
-							if (var20 > 0 || var21 > 0) {
-								int var22 = Tiles.Tiles_heights[var2][var11][var17];
-								int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17];
-								int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1];
-								int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1];
-								int var26 = class4.field31[var11][var17];
-								int var27 = class4.field31[var11 + 1][var17];
-								int var28 = class4.field31[var11 + 1][var17 + 1];
-								int var29 = class4.field31[var11][var17 + 1];
-								int var30 = -1;
-								int var31 = -1;
-								int var32;
-								int var33;
-								int var34;
-								if (var20 > 0) {
-									var32 = var12 * 256 / var15;
-									var33 = var13 / var16;
-									var34 = var14 / var16;
-									var30 = BoundaryObject.hslToRgb(var32, var33, var34);
-									var32 = var32 + Tiles.field477 & 255;
-									var34 += Tiles.field486;
-									if (var34 < 0) {
-										var34 = 0;
-									} else if (var34 > 255) {
-										var34 = 255;
-									}
-
-									var31 = BoundaryObject.hslToRgb(var32, var33, var34);
-								}
-
-								FloorOverlayDefinition var35;
-								if (var2 > 0) {
-									boolean var51 = true;
-									if (var20 == 0 && class210.field2492[var2][var11][var17] != 0) {
-										var51 = false;
-									}
-
-									if (var21 > 0) {
-										var34 = var21 - 1;
-										var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34);
-										FloorOverlayDefinition var47;
-										if (var35 != null) {
-											var47 = var35;
-										} else {
-											byte[] var49 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34);
-											var35 = new FloorOverlayDefinition();
-											if (var49 != null) {
-												var35.decode(new Buffer(var49), var34);
-											}
-
-											var35.postDecode();
-											FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34);
-											var47 = var35;
-										}
-
-										if (!var47.hideUnderlay) {
-											var51 = false;
-										}
-									}
-
-									if (var51 && var23 == var22 && var24 == var22 && var22 == var25) {
-										var10000 = Tiles.field483[var2][var11];
-										var10000[var17] |= 2340;
-									}
-								}
-
-								var32 = 0;
-								if (var31 != -1) {
-									var32 = Rasterizer3D.Rasterizer3D_colorPalette[class197.method3645(var31, 96)];
-								}
-
-								if (var21 == 0) {
-									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), 0, 0, 0, 0, var32, 0);
-								} else {
-									var33 = class210.field2492[var2][var11][var17] + 1;
-									byte var52 = Tiles.field475[var2][var11][var17];
-									int var36 = var21 - 1;
-									FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36);
-									if (var37 != null) {
-										var35 = var37;
-									} else {
-										byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36);
-										var37 = new FloorOverlayDefinition();
-										if (var48 != null) {
-											var37.decode(new Buffer(var48), var36);
-										}
-
-										var37.postDecode();
-										FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36);
-										var35 = var37;
-									}
-
-									int var38 = var35.texture;
-									int var39;
-									int var40;
-									int var41;
-									int var42;
-									if (var38 >= 0) {
-										var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var38);
-										var39 = -1;
-									} else if (var35.primaryRgb == 16711935) {
-										var39 = -2;
-										var38 = -1;
-										var40 = -2;
-									} else {
-										var39 = BoundaryObject.hslToRgb(var35.hue, var35.saturation, var35.lightness);
-										var41 = var35.hue + Tiles.field477 & 255;
-										var42 = var35.lightness + Tiles.field486;
-										if (var42 < 0) {
-											var42 = 0;
-										} else if (var42 > 255) {
-											var42 = 255;
-										}
-
-										var40 = BoundaryObject.hslToRgb(var41, var35.saturation, var42);
-									}
-
-									var41 = 0;
-									if (var40 != -2) {
-										var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)];
-									}
-
-									if (var35.secondaryRgb != -1) {
-										var42 = var35.secondaryHue + Tiles.field477 & 255;
-										int var43 = var35.secondaryLightness + Tiles.field486;
-										if (var43 < 0) {
-											var43 = 0;
-										} else if (var43 > 255) {
-											var43 = 255;
-										}
-
-										var40 = BoundaryObject.hslToRgb(var42, var35.secondarySaturation, var43);
-										var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)];
-									}
-
-									var0.addTile(var2, var11, var17, var33, var52, var38, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), RouteStrategy.method3533(var39, var26), RouteStrategy.method3533(var39, var27), RouteStrategy.method3533(var39, var28), RouteStrategy.method3533(var39, var29), var32, var41);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			for (var11 = 1; var11 < 103; ++var11) {
-				for (var12 = 1; var12 < 103; ++var12) {
-					var0.setTileMinPlane(var2, var12, var11, ObjectDefinition.method4545(var2, var12, var11));
-				}
-			}
-
-			Tiles.field485[var2] = null;
-			AccessFile.field4061[var2] = null;
-			class210.field2492[var2] = null;
-			Tiles.field475[var2] = null;
-			class188.field2321[var2] = null;
-		}
-
-		var0.method3100(-50, -10, -50);
-
-		for (var2 = 0; var2 < 104; ++var2) {
-			for (var3 = 0; var3 < 104; ++var3) {
-				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-					var0.setLinkBelow(var2, var3);
-				}
-			}
-		}
-
-		var2 = 1;
-		var3 = 2;
-		var4 = 4;
-
-		for (var5 = 0; var5 < 4; ++var5) {
-			if (var5 > 0) {
-				var2 <<= 3;
-				var3 <<= 3;
-				var4 <<= 3;
-			}
-
-			for (int var6 = 0; var6 <= var5; ++var6) {
-				for (int var7 = 0; var7 <= 104; ++var7) {
-					for (int var8 = 0; var8 <= 104; ++var8) {
-						short var50;
-						if ((Tiles.field483[var6][var8][var7] & var2) != 0) {
-							var9 = var7;
-							var10 = var7;
-							var11 = var6;
-
-							for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var8][var9 - 1] & var2) != 0; --var9) {
-							}
-
-							while (var10 < 104 && (Tiles.field483[var6][var8][var10 + 1] & var2) != 0) {
-								++var10;
-							}
-
-							label483:
-							while (var11 > 0) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((Tiles.field483[var11 - 1][var8][var13] & var2) == 0) {
-										break label483;
-									}
-								}
-
-								--var11;
-							}
-
-							label472:
-							while (var12 < var5) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((Tiles.field483[var12 + 1][var8][var13] & var2) == 0) {
-										break label472;
-									}
-								}
-
-								++var12;
-							}
-
-							var13 = (var10 - var9 + 1) * (var12 + 1 - var11);
-							if (var13 >= 8) {
-								var50 = 240;
-								var15 = Tiles.Tiles_heights[var12][var8][var9] - var50;
-								var16 = Tiles.Tiles_heights[var11][var8][var9];
-								Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16);
-
-								for (var17 = var11; var17 <= var12; ++var17) {
-									for (var18 = var9; var18 <= var10; ++var18) {
-										var10000 = Tiles.field483[var17][var8];
-										var10000[var18] &= ~var2;
-									}
-								}
-							}
-						}
-
-						if ((Tiles.field483[var6][var8][var7] & var3) != 0) {
-							var9 = var8;
-							var10 = var8;
-							var11 = var6;
-
-							for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var9 - 1][var7] & var3) != 0; --var9) {
-							}
-
-							while (var10 < 104 && (Tiles.field483[var6][var10 + 1][var7] & var3) != 0) {
-								++var10;
-							}
-
-							label536:
-							while (var11 > 0) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((Tiles.field483[var11 - 1][var13][var7] & var3) == 0) {
-										break label536;
-									}
-								}
-
-								--var11;
-							}
-
-							label525:
-							while (var12 < var5) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((Tiles.field483[var12 + 1][var13][var7] & var3) == 0) {
-										break label525;
-									}
-								}
-
-								++var12;
-							}
-
-							var13 = (var12 + 1 - var11) * (var10 - var9 + 1);
-							if (var13 >= 8) {
-								var50 = 240;
-								var15 = Tiles.Tiles_heights[var12][var9][var7] - var50;
-								var16 = Tiles.Tiles_heights[var11][var9][var7];
-								Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16);
-
-								for (var17 = var11; var17 <= var12; ++var17) {
-									for (var18 = var9; var18 <= var10; ++var18) {
-										var10000 = Tiles.field483[var17][var18];
-										var10000[var7] &= ~var3;
-									}
-								}
-							}
-						}
-
-						if ((Tiles.field483[var6][var8][var7] & var4) != 0) {
-							var9 = var8;
-							var10 = var8;
-							var11 = var7;
-
-							for (var12 = var7; var11 > 0 && (Tiles.field483[var6][var8][var11 - 1] & var4) != 0; --var11) {
-							}
-
-							while (var12 < 104 && (Tiles.field483[var6][var8][var12 + 1] & var4) != 0) {
-								++var12;
-							}
-
-							label589:
-							while (var9 > 0) {
-								for (var13 = var11; var13 <= var12; ++var13) {
-									if ((Tiles.field483[var6][var9 - 1][var13] & var4) == 0) {
-										break label589;
-									}
-								}
-
-								--var9;
-							}
-
-							label578:
-							while (var10 < 104) {
-								for (var13 = var11; var13 <= var12; ++var13) {
-									if ((Tiles.field483[var6][var10 + 1][var13] & var4) == 0) {
-										break label578;
-									}
-								}
-
-								++var10;
-							}
-
-							if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) {
-								var13 = Tiles.Tiles_heights[var6][var9][var11];
-								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13);
-
-								for (var14 = var9; var14 <= var10; ++var14) {
-									for (var15 = var11; var15 <= var12; ++var15) {
-										var10000 = Tiles.field483[var6][var14];
-										var10000[var15] &= ~var4;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
+	public boolean equals(Object var1) {
+		return super.equals(var1);
 	}

-	@ObfuscatedName("d")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(III)I",
-		garbageValue = "510477713"
+		signature = "(II)Lij;",
+		garbageValue = "957184783"
 	)
-	static final int method101(int var0, int var1) {
-		int var2 = User.method4969(var0 + 45365, var1 + 91923, 4) - 128 + (User.method4969(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (User.method4969(var0, var1, 1) - 128 >> 2);
-		var2 = (int)(0.3D * (double)var2) + 35;
-		if (var2 < 10) {
-			var2 = 10;
-		} else if (var2 > 60) {
-			var2 = 60;
-		}
-
-		return var2;
-	}
-
-	@ObfuscatedName("gg")
-	@ObfuscatedSignature(
-		signature = "(IIIB)I",
-		garbageValue = "-30"
-	)
-	@Export("getTileHeight")
-	static final int getTileHeight(int var0, int var1, int var2) {
-		int var3 = var0 >> 7;
-		int var4 = var1 >> 7;
-		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
-			int var5 = var2;
-			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
-				var5 = var2 + 1;
-			}
-
-			int var6 = var0 & 127;
-			int var7 = var1 & 127;
-			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7;
-			int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7;
-			return var8 * (128 - var7) + var9 * var7 >> 7;
+	@Export("getParamDefinition")
+	public static ParamDefinition getParamDefinition(int var0) {
+		ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
 		} else {
-			return 0;
+			byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0);
+			var1 = new ParamDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			ParamDefinition.ParamDefinition_cached.put(var1, (long)var0);
+			return var1;
 		}
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
@@ -1,28 +1,37 @@
-import java.awt.Image;
+import java.io.File;
+import java.io.IOException;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("f")
+@ObfuscatedName("n")
@Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -1744737453
-	)
-	@Export("SpriteBuffer_spriteWidth")
-	public static int SpriteBuffer_spriteWidth;
-	@ObfuscatedName("as")
-	static Image field74;
-
-	@ObfuscatedName("s")
+	@ObfuscatedName("pa")
 	@ObfuscatedSignature(
-		signature = "(Lq;Lq;I)I",
-		garbageValue = "1336373316"
+		signature = "Ljz;"
+	)
+	@Export("clanChat")
+	static ClanChat clanChat;
+	@ObfuscatedName("sb")
+	@ObfuscatedSignature(
+		signature = "Lln;"
+	)
+	@Export("worldMap")
+	static WorldMap worldMap;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -135135315
+	)
+	static int field75;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(Lv;Lv;I)I",
+		garbageValue = "-1189972175"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -37,302 +46,53 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		return super.equals(var1);
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)Lig;",
-		garbageValue = "-2004472785"
+		signature = "(B)[Lgn;",
+		garbageValue = "-20"
 	)
-	@Export("HealthBarDefinition_get")
-	public static HealthBarDefinition HealthBarDefinition_get(int var0) {
-		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0);
-			var1 = new HealthBarDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
+	public static class185[] method116() {
+		return new class185[]{class185.field2298, class185.field2300, class185.field2297, class185.field2299, class185.field2304, class185.field2296, class185.field2302, class185.field2301, class185.field2303, class185.field2305};
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "75"
+		signature = "(Ljava/lang/String;Ljava/lang/String;ZB)Lmr;",
+		garbageValue = "48"
 	)
-	@Export("VarbitDefinition_clearCached")
-	public static void VarbitDefinition_clearCached() {
-		VarbitDefinition.VarbitDefinition_cached.clear();
-	}
-
-	@ObfuscatedName("af")
-	@ObfuscatedSignature(
-		signature = "(ILcr;ZI)I",
-		garbageValue = "1195585580"
-	)
-	static int method136(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		if (var0 == ScriptOpcodes.ADD) {
-			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] = var3 + var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SUB) {
-			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] = var3 - var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.MULTIPLY) {
-			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] = var3 * var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.DIV) {
-			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] = var3 / var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOM) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOMINC) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
-			return 1;
-		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
-			Interpreter.Interpreter_intStackSize -= 5;
-			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-			int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
-			int var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5);
-			return 1;
-		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
-			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] = var3 + var4 * var3 / 100;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SETBIT) {
-			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] = var3 | 1 << var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CLEARBIT) {
-			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] = var3 & -1 - (1 << var4);
-			return 1;
-		} else if (var0 == ScriptOpcodes.TESTBIT) {
-			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] = (var3 & 1 << var4) != 0 ? 1 : 0;
-			return 1;
-		} else if (var0 == ScriptOpcodes.MOD) {
-			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] = var3 % var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.POW) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.INVPOW) {
-			Interpreter.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-				return 1;
-			} else {
-				switch(var4) {
-				case 0:
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
-					break;
-				case 1:
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3;
-					break;
-				case 2:
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
-					break;
-				case 3:
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
-					break;
-				case 4:
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
-					break;
-				default:
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
-				}
-
-				return 1;
-			}
-		} else if (var0 == ScriptOpcodes.AND) {
-			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] = var3 & var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.OR) {
-			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] = var3 | var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SCALE) {
-			Interpreter.Interpreter_intStackSize -= 3;
-			long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11);
-			return 1;
-		} else {
-			return 2;
-		}
-	}
-
-	@ObfuscatedName("fg")
-	@ObfuscatedSignature(
-		signature = "(IIII)V",
-		garbageValue = "773083265"
-	)
-	@Export("queueSoundEffect")
-	static void queueSoundEffect(int var0, int var1, int var2) {
-		if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
-			Client.soundEffectIds[Client.soundEffectCount] = var0;
-			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
-			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
-			Client.soundEffects[Client.soundEffectCount] = null;
-			Client.soundLocations[Client.soundEffectCount] = 0;
-			++Client.soundEffectCount;
-		}
-
-	}
-
-	@ObfuscatedName("fh")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-38"
-	)
-	static final void method133() {
-		if (Client.field651 != ItemContainer.plane) {
-			Client.field651 = ItemContainer.plane;
-			AbstractWorldMapData.method264(ItemContainer.plane);
-		}
-
-	}
-
-	@ObfuscatedName("hp")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "78"
-	)
-	@Export("readNpcUpdates")
-	static final void readNpcUpdates() {
-		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.field655[++Client.field899 - 1] = Client.npcIndices[var2];
+	@Export("getPreferencesFile")
+	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
+		File var3 = new File(InvDefinition.cacheDir, "preferences" + var0 + ".dat");
+		if (var3.exists()) {
+			try {
+				AccessFile var10 = new AccessFile(var3, "rw", 10000L);
+				return var10;
+			} catch (IOException var9) {
 			}
 		}

-		if (var1 > Client.npcCount) {
-			throw new RuntimeException("");
-		} else {
-			Client.npcCount = 0;
-
-			for (var2 = 0; var2 < var1; ++var2) {
-				int var3 = Client.npcIndices[var2];
-				NPC var4 = Client.npcs[var3];
-				int var5 = var0.readBits(1);
-				if (var5 == 0) {
-					Client.npcIndices[++Client.npcCount - 1] = var3;
-					var4.npcCycle = Client.cycle;
-				} else {
-					int var6 = var0.readBits(2);
-					if (var6 == 0) {
-						Client.npcIndices[++Client.npcCount - 1] = var3;
-						var4.npcCycle = Client.cycle;
-						Client.field669[++Client.field861 - 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.method1961(var7, (byte)1);
-							var8 = var0.readBits(1);
-							if (var8 == 1) {
-								Client.field669[++Client.field861 - 1] = var3;
-							}
-						} else if (var6 == 2) {
-							Client.npcIndices[++Client.npcCount - 1] = var3;
-							var4.npcCycle = Client.cycle;
-							var7 = var0.readBits(3);
-							var4.method1961(var7, (byte)2);
-							var8 = var0.readBits(3);
-							var4.method1961(var8, (byte)2);
-							int var9 = var0.readBits(1);
-							if (var9 == 1) {
-								Client.field669[++Client.field861 - 1] = var3;
-							}
-						} else if (var6 == 3) {
-							Client.field655[++Client.field899 - 1] = var3;
-						}
-					}
-				}
-			}
-
+		String var4 = "";
+		if (ViewportMouse.cacheGamebuild == 33) {
+			var4 = "_rc";
+		} else if (ViewportMouse.cacheGamebuild == 34) {
+			var4 = "_wip";
 		}
-	}

-	@ObfuscatedName("jp")
-	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-59560739"
-	)
-	static final String method127(int var0) {
-		return var0 < 999999999 ? Integer.toString(var0) : "*";
-	}
+		File var5 = new File(Message.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) {
+			}
+		}

-	@ObfuscatedName("km")
-	@ObfuscatedSignature(
-		signature = "(Lhp;IB)Ljava/lang/String;",
-		garbageValue = "0"
-	)
-	static String method125(Widget var0, int var1) {
-		int var3 = ParamDefinition.getWidgetClickMask(var0);
-		boolean var2 = (var3 >> var1 + 1 & 1) != 0;
-		if (!var2 && var0.onOp == null) {
-			return null;
-		} else {
-			return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null;
+		try {
+			var6 = new AccessFile(var3, "rw", 10000L);
+			return var6;
+		} catch (IOException var7) {
+			throw new RuntimeException();
 		}
 	}
 }
--- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
@@ -1,125 +1,158 @@
 import java.util.Comparator;
-import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("n")
+@ObfuscatedName("u")
@Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("rr")
+	@ObfuscatedName("sl")
 	@ObfuscatedGetter(
-		intValue = 133251749
+		longValue = 7996115852397139965L
 	)
-	static int field34;
-	@ObfuscatedName("q")
-	@Export("soundSystemExecutor")
-	static ScheduledExecutorService soundSystemExecutor;
-	@ObfuscatedName("do")
+	static long field25;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 850096723
+	)
+	@Export("PcmPlayer_sampleRate")
+	public static int PcmPlayer_sampleRate;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lid;"
+		signature = "Llt;"
 	)
-	@Export("archive15")
-	static Archive archive15;
+	@Export("options_buttons_0Sprite")
+	static IndexedSprite options_buttons_0Sprite;
+	@ObfuscatedName("i")
+	static String[] field30;
+	@ObfuscatedName("bt")
+	@ObfuscatedSignature(
+		signature = "Llt;"
+	)
+	static IndexedSprite field32;

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lq;Lq;I)I",
-		garbageValue = "1902979302"
+		signature = "(Lv;Lv;I)I",
+		garbageValue = "2009087817"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1);
 	}

-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}

-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
-		garbageValue = "1594628992"
-	)
-	public static String method74(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();
-		}
+	public boolean equals(Object var1) {
+		return super.equals(var1);
 	}

-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(ILcr;ZI)I",
-		garbageValue = "-1665010136"
+		signature = "(Lkz;I)Ljava/lang/String;",
+		garbageValue = "-1287260544"
 	)
-	static int method79(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? class286.field3623 : class297.field3693;
+	public static String method60(Buffer var0) {
+		String var1;
+		try {
+			int var2 = var0.readUShortSmart();
+			if (var2 > 32767) {
+				var2 = 32767;
+			}
+
+			byte[] var3 = new byte[var2];
+			var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2);
+			String var4 = class51.decodeStringCp1252(var3, 0, var2);
+			var1 = var4;
+		} catch (Exception var6) {
+			var1 = "Cabbage";
 		}

-		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
-			if (Interpreter.field1064 >= 10) {
-				throw new RuntimeException();
-			} else if (var3.onResize == null) {
-				return 0;
-			} else {
-				ScriptEvent var4 = new ScriptEvent();
-				var4.widget = var3;
-				var4.args = var3.onResize;
-				var4.field555 = Interpreter.field1064 + 1;
-				Client.scriptEvents.addFirst(var4);
-				return 1;
-			}
-		} else {
-			return 2;
-		}
+		return var1;
 	}

-	@ObfuscatedName("bo")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "516723982"
+		signature = "(I)V",
+		garbageValue = "236963295"
 	)
-	public static int method80(String var0) {
-		return var0.length() + 2;
+	public static void method62() {
+		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "([BI)V",
+		garbageValue = "1642239877"
+	)
+	@Export("SpriteBuffer_decode")
+	public static void SpriteBuffer_decode(byte[] var0) {
+		Buffer var1 = new Buffer(var0);
+		var1.offset = var0.length - 2;
+		class325.SpriteBuffer_spriteCount = var1.readUnsignedShort();
+		class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount];
+		SecureRandomCallable.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount];
+		class325.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount];
+		SoundSystem.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount];
+		InvDefinition.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][];
+		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8;
+		class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort();
+		class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort();
+		int var2 = (var1.readUnsignedByte() & 255) + 1;
+
+		int var3;
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			SecureRandomCallable.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			class325.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			SoundSystem.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
+		}
+
+		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3;
+		class325.SpriteBuffer_spritePalette = new int[var2];
+
+		for (var3 = 1; var3 < var2; ++var3) {
+			class325.SpriteBuffer_spritePalette[var3] = var1.readMedium();
+			if (class325.SpriteBuffer_spritePalette[var3] == 0) {
+				class325.SpriteBuffer_spritePalette[var3] = 1;
+			}
+		}
+
+		var1.offset = 0;
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			int var4 = class325.SpriteBuffer_spriteWidths[var3];
+			int var5 = SoundSystem.SpriteBuffer_spriteHeights[var3];
+			int var6 = var5 * var4;
+			byte[] var7 = new byte[var6];
+			InvDefinition.SpriteBuffer_pixels[var3] = var7;
+			int var8 = var1.readUnsignedByte();
+			int var9;
+			if (var8 == 0) {
+				for (var9 = 0; var9 < var6; ++var9) {
+					var7[var9] = var1.readByte();
+				}
+			} else if (var8 == 1) {
+				for (var9 = 0; var9 < var4; ++var9) {
+					for (int var10 = 0; var10 < var5; ++var10) {
+						var7[var9 + var4 * var10] = var1.readByte();
+					}
+				}
+			}
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/GraphicsDefaults.java
+++ b/runescape-client/src/main/java/GraphicsDefaults.java
@@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("kp")
+@ObfuscatedName("kk")
@Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("s")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2112004677
+		intValue = -1326295971
+	)
+	@Export("canvasWidth")
+	public static int canvasWidth;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 743645305
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -258294563
+		intValue = -1263393423
 	)
-	public int field3806;
-	@ObfuscatedName("i")
+	public int field3794;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 701602469
+		intValue = -222158885
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -2141260483
+		intValue = 293018585
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -479103763
-	)
-	public int field3805;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -556598901
-	)
-	public int field3802;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 885733673
-	)
-	public int field3798;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 1784857591
-	)
-	public int field3804;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 2055927251
+		intValue = 59968597
 	)
 	public int field3797;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 407705871
+	)
+	public int field3798;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 24582741
+	)
+	public int field3800;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1990585073
+	)
+	public int field3804;
 	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1869072211
+		intValue = 309369313
 	)
 	public int field3801;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1312425167
+		intValue = -328738669
 	)
-	public int field3807;
+	public int field3802;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -1048737749
+	)
+	public int field3799;

 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3806 = -1;
+		this.field3794 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3805 = -1;
-		this.field3802 = -1;
-		this.field3798 = -1;
-		this.field3804 = -1;
 		this.field3797 = -1;
+		this.field3798 = -1;
+		this.field3800 = -1;
+		this.field3804 = -1;
 		this.field3801 = -1;
-		this.field3807 = -1;
+		this.field3802 = -1;
+		this.field3799 = -1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(Lhz;I)V",
-		garbageValue = "-2074842335"
+		garbageValue = "361058639"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3794.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3792.group);
 		Buffer var3 = new Buffer(var2);

 		while (true) {
@@ -101,18 +107,67 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5602();
-				this.field3806 = var3.method5602();
-				this.mapScenes = var3.method5602();
-				this.headIconsPk = var3.method5602();
-				this.field3805 = var3.method5602();
-				this.field3802 = var3.method5602();
-				this.field3798 = var3.method5602();
-				this.field3804 = var3.method5602();
-				this.field3797 = var3.method5602();
-				this.field3801 = var3.method5602();
-				this.field3807 = var3.method5602();
+				this.compass = var3.method5623();
+				this.field3794 = var3.method5623();
+				this.mapScenes = var3.method5623();
+				this.headIconsPk = var3.method5623();
+				this.field3797 = var3.method5623();
+				this.field3798 = var3.method5623();
+				this.field3800 = var3.method5623();
+				this.field3804 = var3.method5623();
+				this.field3801 = var3.method5623();
+				this.field3802 = var3.method5623();
+				this.field3799 = var3.method5623();
 			}
 		}
 	}
+
+	@ObfuscatedName("ji")
+	@ObfuscatedSignature(
+		signature = "(IIII)Lbw;",
+		garbageValue = "-1376012645"
+	)
+	static final InterfaceParent method5875(int var0, int var1, int var2) {
+		InterfaceParent var3 = new InterfaceParent();
+		var3.group = var1;
+		var3.type = var2;
+		Client.interfaceParents.put(var3, (long)var0);
+		DevicePcmPlayerProvider.Widget_resetModelFrames(var1);
+		Widget var4 = Player.getWidget(var0);
+		WorldMapID.invalidateWidget(var4);
+		if (Client.meslayerContinueWidget != null) {
+			WorldMapID.invalidateWidget(Client.meslayerContinueWidget);
+			Client.meslayerContinueWidget = null;
+		}
+
+		for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
+			int var7 = Client.menuOpcodes[var5];
+			boolean var6 = var7 == 57 || var7 == 58 || var7 == 1007 || var7 == 25 || var7 == 30;
+			if (var6) {
+				if (var5 < Client.menuOptionsCount - 1) {
+					for (int var8 = var5; var8 < Client.menuOptionsCount - 1; ++var8) {
+						Client.menuActions[var8] = Client.menuActions[var8 + 1];
+						Client.menuTargets[var8] = Client.menuTargets[var8 + 1];
+						Client.menuOpcodes[var8] = Client.menuOpcodes[var8 + 1];
+						Client.menuIdentifiers[var8] = Client.menuIdentifiers[var8 + 1];
+						Client.menuArguments1[var8] = Client.menuArguments1[var8 + 1];
+						Client.menuArguments2[var8] = Client.menuArguments2[var8 + 1];
+						Client.menuShiftClick[var8] = Client.menuShiftClick[var8 + 1];
+					}
+				}
+
+				--var5;
+				--Client.menuOptionsCount;
+			}
+		}
+
+		WorldMapRegion.calculateMenuBounds();
+		class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var0 >> 16], var4, false);
+		Tile.runWidgetOnLoadListener(var1);
+		if (Client.rootInterface != -1) {
+			WorldMapRectangle.runIntfCloseListeners(Client.rootInterface, 1);
+		}
+
+		return var3;
+	}
 }
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -3,74 +3,71 @@ 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("bc")
+@ObfuscatedName("bq")
@Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("qe")
-	@ObfuscatedGetter(
-		intValue = -487309312
+	@ObfuscatedName("fa")
+	@ObfuscatedSignature(
+		signature = "Lku;"
 	)
-	static int field1079;
-	@ObfuscatedName("gx")
-	@Export("regionLandArchives")
-	static byte[][] regionLandArchives;
-	@ObfuscatedName("s")
+	@Export("WorldMapElement_fonts")
+	static Fonts WorldMapElement_fonts;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -609520515
+		intValue = -46719175
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 528073861
+		intValue = 824152429
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -652492191
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("i")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1305204903
+		intValue = -1299632507
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("k")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1986692437
+		intValue = -1087465937
 	)
 	@Export("x")
 	int x;
 	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 575337647
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -893117639
+		intValue = 12234547
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lij;"
+		signature = "Liw;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1568571077
+		intValue = 353830109
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1439045539
+		intValue = 1621269353
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("isFinished")
 	boolean isFinished;

@@ -84,20 +81,20 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = NetCache.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = Widget.SequenceDefinition_get(var8);
+			this.sequenceDefinition = class83.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IS)V",
-		garbageValue = "-9690"
+		signature = "(II)V",
+		garbageValue = "477710925"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -116,14 +113,14 @@ public final class GraphicsObject extends Entity {
 		}
 	}

-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(I)Ldo;",
-		garbageValue = "-419920513"
+		signature = "(B)Ldr;",
+		garbageValue = "-35"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = NetCache.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -134,49 +131,65 @@ public final class GraphicsObject extends Entity {
 		return var2 == null ? null : var2;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "971415890"
+		signature = "(Lkt;B)V",
+		garbageValue = "-5"
 	)
-	public static boolean method1946(int var0) {
-		return var0 == WorldMapDecorationType.field2722.id;
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "85520367"
-	)
-	@Export("hasReflectionCheck")
-	public static boolean hasReflectionCheck() {
-		ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last();
-		return var0 != null;
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "(ILcr;ZI)I",
-		garbageValue = "886521701"
-	)
-	static int method1939(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class286.field3623 : class297.field3693;
-		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;
+	@Export("updatePlayer")
+	static final void updatePlayer(PacketBuffer var0) {
+		var0.importIndex();
+		int var1 = Client.localPlayerIndex;
+		Player var2 = Varps.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 - class4.baseX * 64;
+		var2.x = ((var2.pathX[0] << 7) + (var2.transformedSize() << 6)) * 62504387;
+		var2.pathY[0] = var6 - ScriptEvent.baseY;
+		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
+		MouseRecorder.plane = var2.plane = var4;
+		if (Players.field1221[var1] != null) {
+			var2.read(Players.field1221[var1]);
 		}
+
+		Players.Players_count = 0;
+		Players.Players_indices[++Players.Players_count - 1] = var1;
+		Players.field1217[var1] = 0;
+		Players.Players_emptyIdxCount = 0;
+
+		for (int var7 = 1; var7 < 2048; ++var7) {
+			if (var7 != var1) {
+				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.field1217[var7] = 0;
+			}
+		}
+
+		var0.exportIndex();
+	}
+
+	@ObfuscatedName("hl")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "4"
+	)
+	@Export("addCancelMenuEntry")
+	static void addCancelMenuEntry() {
+		Client.menuOptionsCount = 0;
+		Client.isMenuOpen = false;
+		Client.menuActions[0] = "Cancel";
+		Client.menuTargets[0] = "";
+		Client.menuOpcodes[0] = 1006;
+		Client.menuShiftClick[0] = false;
+		Client.menuOptionsCount = 1;
 	}
 }
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -2,35 +2,62 @@ 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("ce")
+@ObfuscatedName("cb")
@Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("j")
+	static byte[][][] field1089;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Lig;"
+		signature = "Llt;"
+	)
+	@Export("logoSprite")
+	static IndexedSprite logoSprite;
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		signature = "Lhz;"
+	)
+	@Export("Widget_spritesArchive")
+	static AbstractArchive Widget_spritesArchive;
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "Lco;"
+	)
+	@Export("pcmPlayerProvider")
+	public static PcmPlayerProvider pcmPlayerProvider;
+	@ObfuscatedName("fp")
+	@ObfuscatedSignature(
+		signature = "Lkf;"
+	)
+	@Export("fontBold12")
+	static Font fontBold12;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "Lix;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		signature = "Ljd;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;

 	@ObfuscatedSignature(
-		signature = "(Lig;)V"
+		signature = "(Lix;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "1581438808"
+		garbageValue = "-1491232381"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -63,10 +90,10 @@ public class HealthBar extends Node {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IB)Lbb;",
-		garbageValue = "-77"
+		signature = "(IB)Lbl;",
+		garbageValue = "1"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -77,7 +104,7 @@ public class HealthBar extends Node {
 				var2 = var3;
 			}

-			if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
+			if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
 				return var2;
 			} else {
 				var2.remove();
@@ -88,13 +115,195 @@ public class HealthBar extends Node {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "88"
+		signature = "(I)Z",
+		garbageValue = "-796562710"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method4729();
+		return this.updates.method4874();
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(CI)Z",
+		garbageValue = "-60300776"
+	)
+	@Export("isAlphaNumeric")
+	public static boolean isAlphaNumeric(char var0) {
+		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+	}
+
+	@ObfuscatedName("al")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZI)I",
+		garbageValue = "-1113312719"
+	)
+	static int method2006(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		if (var0 == ScriptOpcodes.ADD) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SUB) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 - var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.MULTIPLY) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 * var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.DIV) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 / var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.RANDOM) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.RANDOMINC) {
+			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
+			return 1;
+		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
+			class160.Interpreter_intStackSize -= 5;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			int var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
+			int var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
+			int var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 4];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
+			return 1;
+		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SETBIT) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 | 1 << var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CLEARBIT) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
+			return 1;
+		} else if (var0 == ScriptOpcodes.TESTBIT) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
+			return 1;
+		} else if (var0 == ScriptOpcodes.MOD) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 % var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.POW) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			if (var3 == 0) {
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+			} else {
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.INVPOW) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			if (var3 == 0) {
+				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
+				return 1;
+			} else {
+				switch(var4) {
+				case 0:
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
+					break;
+				case 1:
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3;
+					break;
+				case 2:
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
+					break;
+				case 3:
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
+					break;
+				case 4:
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
+					break;
+				default:
+					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
+				}
+
+				return 1;
+			}
+		} else if (var0 == ScriptOpcodes.AND) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.OR) {
+			class160.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 | var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SCALE) {
+			class160.Interpreter_intStackSize -= 3;
+			long var9 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			long var11 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+			long var13 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
+			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11);
+			return 1;
+		} else {
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("ab")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZB)I",
+		garbageValue = "-65"
+	)
+	static int method1999(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.LOGOUT) {
+			Client.logoutTimer = 250;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("hy")
+	@ObfuscatedSignature(
+		signature = "(IIIII)V",
+		garbageValue = "-1895452388"
+	)
+	static final void method2007(int var0, int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
+			if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
+				Client.field827[var4] = true;
+			}
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/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("ig")
+@ObfuscatedName("ix")
@Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
 	@Export("HealthBarDefinition_archive")
 	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
-	@Export("HealthBarDefinition_spritesArchive")
-	public static AbstractArchive HealthBarDefinition_spritesArchive;
-	@ObfuscatedName("i")
+	@Export("HitSplatDefinition_spritesArchive")
+	static AbstractArchive HitSplatDefinition_spritesArchive;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Let;"
 	)
 	@Export("HealthBarDefinition_cached")
-	static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("k")
+	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Let;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1504637567
+		intValue = -1806671907
 	)
-	public int field3264;
-	@ObfuscatedName("q")
+	public int field3253;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1807788243
+		intValue = 379529355
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1909708279
+		intValue = -1016386229
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1885853349
+		intValue = -565788357
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -563818397
+		intValue = -1008936631
 	)
 	@Export("int4")
 	public int int4;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -74768593
+		intValue = -1386850377
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1506111747
+		intValue = 1663965695
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1208608669
+		intValue = 1998724721
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -567354113
+		intValue = -1503683449
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("b")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1929001923
+		intValue = 571878805
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -96,7 +96,7 @@ public class HealthBarDefinition extends DualNode {
 		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
 	}

-	HealthBarDefinition() {
+	public HealthBarDefinition() {
 		this.int1 = 255;
 		this.int2 = 255;
 		this.int3 = -1;
@@ -108,13 +108,13 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lky;I)V",
-		garbageValue = "-2108312426"
+		signature = "(Lkz;B)V",
+		garbageValue = "0"
 	)
 	@Export("decode")
-	void decode(Buffer var1) {
+	public void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -125,10 +125,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;II)V",
-		garbageValue = "1232956083"
+		signature = "(Lkz;II)V",
+		garbageValue = "1787792869"
 	)
 	@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.method5602();
+			this.frontSpriteID = var1.method5623();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5602();
+			this.backSpriteID = var1.method5623();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -158,10 +158,10 @@ public class HealthBarDefinition extends DualNode {

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(I)Lls;",
-		garbageValue = "32246110"
+		signature = "(B)Lli;",
+		garbageValue = "-8"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
@@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = FillMode.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("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(I)Lls;",
-		garbageValue = "2113280722"
+		signature = "(I)Lli;",
+		garbageValue = "1663906218"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
@@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = FillMode.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
@@ -205,4 +205,19 @@ public class HealthBarDefinition extends DualNode {
 			}
 		}
 	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "(CII)Ljava/lang/String;",
+		garbageValue = "-1190988008"
+	)
+	public static String method4481(char var0, int var1) {
+		char[] var2 = new char[var1];
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var2[var3] = var0;
+		}
+
+		return new String(var2);
+	}
 }
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -1,48 +1,34 @@
-import java.awt.FontMetrics;
+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("bb")
+@ObfuscatedName("bl")
@Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("nk")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1632744841
-	)
-	static int field986;
-	@ObfuscatedName("az")
-	@Export("loginScreenFontMetrics")
-	static FontMetrics loginScreenFontMetrics;
-	@ObfuscatedName("dp")
-	@ObfuscatedSignature(
-		signature = "Lid;"
-	)
-	@Export("archive2")
-	static Archive archive2;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1232956083
+		intValue = 563892135
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -840023753
+		intValue = 1489030815
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -207161283
+		intValue = -1355122563
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 309403729
+		intValue = -716904445
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -54,10 +40,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "-782735751"
+		garbageValue = "-1563848755"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -67,35 +53,35 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("ga")
 	@ObfuscatedSignature(
-		signature = "(II)Lil;",
-		garbageValue = "-790003135"
+		signature = "(I)V",
+		garbageValue = "-330956579"
 	)
-	@Export("SpotAnimationDefinition_get")
-	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
-		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
-			var1 = new SpotAnimationDefinition();
-			var1.id = var0;
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0);
-			return var1;
+	static void method1708() {
+		if (Client.renderSelf) {
+			GameObject.addPlayerToScene(Varps.localPlayer, false);
 		}
+
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("jy")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "0"
+		signature = "(B)V",
+		garbageValue = "-86"
 	)
-	static int method1683() {
-		return 11;
+	@Export("FriendSystem_invalidateIgnoreds")
+	static final void FriendSystem_invalidateIgnoreds() {
+		Iterator var0 = Messages.Messages_hashTable.iterator();
+
+		while (var0.hasNext()) {
+			Message var1 = (Message)var0.next();
+			var1.clearIsFromIgnored();
+		}
+
+		if (GrandExchangeOfferUnitPriceComparator.clanChat != null) {
+			GrandExchangeOfferUnitPriceComparator.clanChat.invalidateIgnoreds();
+		}
+
 	}
 }
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -4,109 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("io")
+@ObfuscatedName("ic")
@Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "Lhz;"
 	)
 	@Export("HitSplatDefinition_archive")
-	public static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("k")
+	static AbstractArchive HitSplatDefinition_archive;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Lhz;"
+	)
+	static AbstractArchive field3300;
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "Let;"
 	)
 	@Export("HitSplatDefinition_cached")
 	static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Let;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Let;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1215732899
+		intValue = -357420585
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1479775449
+		intValue = 327492087
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -999843627
+		intValue = -687651927
 	)
-	public int field3314;
+	public int field3306;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -478859311
+		intValue = 1048362973
 	)
-	int field3315;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 1276859251
-	)
-	int field3316;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -348958833
-	)
-	int field3311;
+	int field3314;
 	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 740187387
+		intValue = -224285899
+	)
+	int field3308;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = 163479341
 	)
 	int field3312;
-	@ObfuscatedName("z")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 417347841
+		intValue = 295694895
 	)
-	public int field3319;
-	@ObfuscatedName("a")
+	int field3313;
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1914679
+		intValue = -1371594611
+	)
+	public int field3311;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1444212513
+	)
+	public int field3310;
+	@ObfuscatedName("k")
+	@ObfuscatedGetter(
+		intValue = -1563267253
 	)
 	public int field3307;
 	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = 348395975
-	)
-	public int field3318;
-	@ObfuscatedName("l")
-	String field3322;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -172728541
-	)
-	public int field3323;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 1823926687
-	)
-	public int field3324;
+	String field3309;
 	@ObfuscatedName("m")
-	@Export("transforms")
-	public int[] transforms;
+	@ObfuscatedGetter(
+		intValue = 1065378437
+	)
+	public int field3315;
 	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1435373639
+		intValue = -267578869
+	)
+	public int field3316;
+	@ObfuscatedName("a")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -222601541
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("av")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1817930543
+		intValue = 158583145
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -120,25 +125,25 @@ public class HitSplatDefinition extends DualNode {
 	HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3314 = 70;
-		this.field3315 = -1;
-		this.field3316 = -1;
-		this.field3311 = -1;
+		this.field3306 = 70;
+		this.field3314 = -1;
+		this.field3308 = -1;
 		this.field3312 = -1;
-		this.field3319 = 0;
-		this.field3307 = 0;
-		this.field3318 = -1;
-		this.field3322 = "";
-		this.field3323 = -1;
-		this.field3324 = 0;
+		this.field3313 = -1;
+		this.field3311 = 0;
+		this.field3310 = 0;
+		this.field3307 = -1;
+		this.field3309 = "";
+		this.field3315 = -1;
+		this.field3316 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;I)V",
-		garbageValue = "513120287"
+		signature = "(Lkz;I)V",
+		garbageValue = "1961600783"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -152,41 +157,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Lky;II)V",
-		garbageValue = "198357624"
+		signature = "(Lkz;II)V",
+		garbageValue = "138973037"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5602();
+			this.fontId = var1.method5623();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3315 = var1.method5602();
+			this.field3314 = var1.method5623();
 		} else if (var2 == 4) {
-			this.field3311 = var1.method5602();
+			this.field3312 = var1.method5623();
 		} else if (var2 == 5) {
-			this.field3316 = var1.method5602();
+			this.field3308 = var1.method5623();
 		} else if (var2 == 6) {
-			this.field3312 = var1.method5602();
+			this.field3313 = var1.method5623();
 		} else if (var2 == 7) {
-			this.field3319 = var1.readShort();
+			this.field3311 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3322 = var1.readStringCp1252NullCircumfixed();
+			this.field3309 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3314 = var1.readUnsignedShort();
+			this.field3306 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3307 = var1.readShort();
+			this.field3310 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3318 = 0;
+			this.field3307 = 0;
 		} else if (var2 == 12) {
-			this.field3323 = var1.readUnsignedByte();
+			this.field3315 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3324 = var1.readShort();
+			this.field3316 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3318 = var1.readUnsignedShort();
+			this.field3307 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -221,16 +226,16 @@ public class HitSplatDefinition extends DualNode {

 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(I)Lio;",
-		garbageValue = "-1634643296"
+		signature = "(I)Lic;",
+		garbageValue = "-2043410275"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = class208.getVarbit(this.transformVarbit);
+			var1 = WorldMapCacheName.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -242,17 +247,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}

-		return var2 != -1 ? StructDefinition.HitSplatDefinition_get(var2) : null;
+		return var2 != -1 ? Interpreter.HitSplatDefinition_get(var2) : null;
 	}

 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
-		garbageValue = "188489511"
+		signature = "(IB)Ljava/lang/String;",
+		garbageValue = "-7"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3322;
+		String var2 = this.field3309;

 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -260,26 +265,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}

-			var2 = var2.substring(0, var3) + Friend.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + Skeleton.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}

-	@ObfuscatedName("n")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(B)Lls;",
-		garbageValue = "108"
+		signature = "(I)Lli;",
+		garbageValue = "-1669943283"
 	)
-	public Sprite method4494() {
-		if (this.field3315 < 0) {
+	public Sprite method4568() {
+		if (this.field3314 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3315);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3314);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3315, 0);
+				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3314, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3315);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3314);
 				}

 				return var1;
@@ -287,68 +292,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)Lls;",
-		garbageValue = "1004292382"
+		signature = "(I)Lli;",
+		garbageValue = "-675719915"
 	)
-	public Sprite method4468() {
-		if (this.field3316 < 0) {
+	public Sprite method4581() {
+		if (this.field3308 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3316);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3308);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3316, 0);
+				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3308, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3316);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(B)Lls;",
-		garbageValue = "101"
-	)
-	public Sprite method4472() {
-		if (this.field3311 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3311);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3311, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3311);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(B)Lls;",
-		garbageValue = "-74"
-	)
-	public Sprite method4470() {
-		if (this.field3312 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3312, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3308);
 				}

 				return var1;
@@ -358,8 +317,54 @@ public class HitSplatDefinition extends DualNode {

 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(I)Lkb;",
-		garbageValue = "489170470"
+		signature = "(I)Lli;",
+		garbageValue = "-1399773302"
+	)
+	public Sprite method4570() {
+		if (this.field3312 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3312, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(S)Lli;",
+		garbageValue = "-24882"
+	)
+	public Sprite method4561() {
+		if (this.field3313 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3313);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3313, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3313);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(B)Lkf;",
+		garbageValue = "0"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -370,49 +375,196 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FileSystem.SpriteBuffer_getFont(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, class43.HitSplatDefinition_fontsArchive, this.fontId, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
+				AbstractArchive var3 = field3300;
+				AbstractArchive var4 = class189.HitSplatDefinition_fontsArchive;
+				int var5 = this.fontId;
+				byte[] var7 = var3.takeFile(var5, 0);
+				boolean var6;
+				if (var7 == null) {
+					var6 = false;
+				} else {
+					GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7);
+					var6 = true;
 				}

-				return var1;
+				Font var2;
+				if (!var6) {
+					var2 = null;
+				} else {
+					byte[] var8 = var4.takeFile(var5, 0);
+					Font var10;
+					if (var8 == null) {
+						var10 = null;
+					} else {
+						Font var9 = new Font(var8, class325.SpriteBuffer_xOffsets, SecureRandomCallable.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, SoundSystem.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, InvDefinition.SpriteBuffer_pixels);
+						class192.SpriteBuffer_clear();
+						var10 = var9;
+					}
+
+					var2 = var10;
+				}
+
+				if (var2 != null) {
+					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
+				}
+
+				return var2;
 			}
 		}
 	}

-	@ObfuscatedName("gn")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-977763631"
+		signature = "([BIII)Z",
+		garbageValue = "-240401517"
 	)
-	static boolean method4497() {
-		return (Client.drawPlayerNames & 4) != 0;
+	static final boolean method4589(byte[] var0, int var1, int var2) {
+		boolean var3 = true;
+		Buffer var4 = new Buffer(var0);
+		int var5 = -1;
+
+		label67:
+		while (true) {
+			int var6 = var4.method5480();
+			if (var6 == 0) {
+				return var3;
+			}
+
+			var5 += var6;
+			int var7 = 0;
+			boolean var8 = false;
+
+			while (true) {
+				int var9;
+				while (!var8) {
+					var9 = var4.readUShortSmart();
+					if (var9 == 0) {
+						continue label67;
+					}
+
+					var7 += var9 - 1;
+					int var10 = var7 & 63;
+					int var11 = var7 >> 6 & 63;
+					int var12 = var4.readUnsignedByte() >> 2;
+					int var13 = var11 + var1;
+					int var14 = var10 + var2;
+					if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
+						ObjectDefinition var15 = WallDecoration.getObjectDefinition(var5);
+						if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
+							if (!var15.needsModelFiles()) {
+								++Client.field676;
+								var3 = false;
+							}
+
+							var8 = true;
+						}
+					}
+				}
+
+				var9 = var4.readUShortSmart();
+				if (var9 == 0) {
+					break;
+				}
+
+				var4.readUnsignedByte();
+			}
+		}
 	}

-	@ObfuscatedName("ih")
+	@ObfuscatedName("fp")
 	@ObfuscatedSignature(
-		signature = "(IIIIII)V",
-		garbageValue = "-380288285"
+		signature = "(Lbe;B)V",
+		garbageValue = "0"
 	)
-	@Export("drawScrollBar")
-	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
-		ClientPreferences.scrollBarSprites[0].drawAt(var0, var1);
-		ClientPreferences.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field702);
-		int var5 = var3 * (var3 - 32) / var4;
-		if (var5 < 8) {
-			var5 = 8;
+	static final void method4558(Actor var0) {
+		var0.isWalking = false;
+		SequenceDefinition var1;
+		if (var0.movementSequence != -1) {
+			var1 = class83.SequenceDefinition_get(var0.movementSequence);
+			if (var1 != null && var1.frameIds != null) {
+				++var0.movementFrameCycle;
+				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
+					var0.movementFrameCycle = 1;
+					++var0.movementFrame;
+					WorldMapSectionType.addSequenceSoundEffect(var1, var0.movementFrame, var0.x * -78439701, var0.y);
+				}
+
+				if (var0.movementFrame >= var1.frameIds.length) {
+					var0.movementFrameCycle = 0;
+					var0.movementFrame = 0;
+					WorldMapSectionType.addSequenceSoundEffect(var1, var0.movementFrame, var0.x * -78439701, var0.y);
+				}
+			} else {
+				var0.movementSequence = -1;
+			}
+		}
+
+		if (var0.spotAnimation != -1 && Client.cycle >= var0.field957) {
+			if (var0.spotAnimationFrame < 0) {
+				var0.spotAnimationFrame = 0;
+			}
+
+			int var3 = NetCache.SpotAnimationDefinition_get(var0.spotAnimation).sequence;
+			if (var3 != -1) {
+				SequenceDefinition var2 = class83.SequenceDefinition_get(var3);
+				if (var2 != null && var2.frameIds != null) {
+					++var0.spotAnimationFrameCycle;
+					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
+						var0.spotAnimationFrameCycle = 1;
+						++var0.spotAnimationFrame;
+						WorldMapSectionType.addSequenceSoundEffect(var2, var0.spotAnimationFrame, var0.x * -78439701, var0.y);
+					}
+
+					if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
+						var0.spotAnimation = -1;
+					}
+				} else {
+					var0.spotAnimation = -1;
+				}
+			} else {
+				var0.spotAnimation = -1;
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
+			var1 = class83.SequenceDefinition_get(var0.sequence);
+			if (var1.field3496 == 1 && var0.field969 > 0 && var0.field963 <= Client.cycle && var0.field964 < Client.cycle) {
+				var0.sequenceDelay = 1;
+				return;
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay == 0) {
+			var1 = class83.SequenceDefinition_get(var0.sequence);
+			if (var1 != null && var1.frameIds != null) {
+				++var0.sequenceFrameCycle;
+				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
+					var0.sequenceFrameCycle = 1;
+					++var0.sequenceFrame;
+					WorldMapSectionType.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x * -78439701, var0.y);
+				}
+
+				if (var0.sequenceFrame >= var1.frameIds.length) {
+					var0.sequenceFrame -= var1.frameCount;
+					++var0.field924;
+					if (var0.field924 >= var1.field3492) {
+						var0.sequence = -1;
+					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
+						WorldMapSectionType.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x * -78439701, var0.y);
+					} else {
+						var0.sequence = -1;
+					}
+				}
+
+				var0.isWalking = var1.field3495;
+			} else {
+				var0.sequence = -1;
+			}
+		}
+
+		if (var0.sequenceDelay > 0) {
+			--var0.sequenceDelay;
 		}

-		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field687);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field689);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field689);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field689);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field689);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field688);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field688);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field688);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field688);
 	}
 }
--- a/runescape-client/src/main/java/HorizontalAlignment.java
+++ b/runescape-client/src/main/java/HorizontalAlignment.java
@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ib")
+@ObfuscatedName("ie")
@Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lib;"
+		signature = "Lie;"
 	)
-	field3436(2, 0),
-	@ObfuscatedName("j")
+	field3428(2, 0),
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lib;"
+		signature = "Lie;"
 	)
 	@Export("HorizontalAlignment_centered")
 	HorizontalAlignment_centered(1, 1),
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lib;"
+		signature = "Lie;"
 	)
-	field3435(0, 2);
+	field3430(0, 2);

-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1418723399
+		intValue = -490726387
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1581275369
+		intValue = 501971729
 	)
 	@Export("id")
 	final int id;
@@ -42,10 +42,10 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-32"
+		signature = "(I)I",
+		garbageValue = "-1410702910"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
--- a/runescape-client/src/main/java/Huffman.java
+++ b/runescape-client/src/main/java/Huffman.java
@@ -3,24 +3,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("hr")
+@ObfuscatedName("hq")
@Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "Lhz;"
-	)
-	@Export("Widget_modelsArchive")
-	static AbstractArchive Widget_modelsArchive;
-	@ObfuscatedName("r")
-	static boolean field2486;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("keys")
 	int[] keys;

@@ -107,10 +99,10 @@ public class Huffman {

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([BII[BIB)I",
-		garbageValue = "75"
+		signature = "([BII[BII)I",
+		garbageValue = "-1468979642"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -128,7 +120,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) {
@@ -158,10 +150,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "([BI[BIII)I",
-		garbageValue = "-1981194731"
+		garbageValue = "-103624284"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -302,33 +294,27 @@ public class Huffman {
 		}
 	}

-	@ObfuscatedName("k")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "762083438"
+		signature = "(S)V",
+		garbageValue = "-31428"
 	)
-	public static boolean method3901(int var0) {
-		return (var0 >> 30 & 1) != 0;
+	static void method3942() {
+		Players.Players_count = 0;
+
+		for (int var0 = 0; var0 < 2048; ++var0) {
+			Players.field1221[var0] = null;
+			Players.field1220[var0] = 1;
+		}
+
 	}

-	@ObfuscatedName("r")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
-		garbageValue = "24"
+		signature = "(I)V",
+		garbageValue = "-434876538"
 	)
-	public static String method3903(CharSequence var0) {
-		return FontName.method5230('*', var0.length());
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "191831617"
-	)
-	static final void method3902(String var0) {
-		PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher);
-		var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0));
-		var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-		Client.packetWriter.addNode(var1);
+	static final void method3943() {
+		WorldMapSection2.method283("You can't add yourself to your own ignore list");
 	}
 }
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -3,60 +3,48 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jk")
+@ObfuscatedName("ji")
@Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("qz")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lcq;"
-	)
-	@Export("pcmStreamMixer")
-	static PcmStreamMixer pcmStreamMixer;
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "Ler;"
-	)
-	@Export("World_request")
-	static UrlRequest World_request;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;

 	@ObfuscatedSignature(
-		signature = "(Llu;)V"
+		signature = "(Lll;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Lju;",
-		garbageValue = "-192021045"
+		signature = "(I)Ljw;",
+		garbageValue = "-734254876"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(II)[Lju;",
-		garbageValue = "518998026"
+		signature = "(II)[Ljw;",
+		garbageValue = "1353779565"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;II)V",
-		garbageValue = "-1855918635"
+		signature = "(Lkz;IB)V",
+		garbageValue = "112"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -71,7 +59,7 @@ public class IgnoreList extends UserList {
 					Ignored var7 = (Ignored)this.getByCurrentUsername(var5);
 					if (var4) {
 						Ignored var8 = (Ignored)this.getByCurrentUsername(var6);
-						if (var8 != null && var8 != var7) {
+						if (var8 != null && var7 != var8) {
 							if (var7 != null) {
 								this.remove(var8);
 							} else {
@@ -99,4 +87,14 @@ public class IgnoreList extends UserList {
 			return;
 		}
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "-317762275"
+	)
+	@Export("parseInt")
+	public static int parseInt(CharSequence var0) {
+		return class51.parseIntCustomRadix(var0, 10, true);
+	}
 }
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -4,12 +4,17 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jb")
+@ObfuscatedName("ja")
@Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("s")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1012205769
+		intValue = -741331501
+	)
+	static int field3577;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 2731755
 	)
 	@Export("id")
 	int id;
@@ -17,20 +22,20 @@ public class Ignored extends User {
 	Ignored() {
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljb;I)I",
-		garbageValue = "-765920098"
+		signature = "(Lja;I)I",
+		garbageValue = "-1305970112"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}

-	@ObfuscatedName("ai")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		signature = "(Lju;B)I",
-		garbageValue = "1"
+		signature = "(Ljw;B)I",
+		garbageValue = "-92"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -40,70 +45,4 @@ public class Ignored extends User {
 	public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1);
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;IZI)I",
-		garbageValue = "-1916519196"
-	)
-	@Export("parseIntCustomRadix")
-	public static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) {
-		if (var1 >= 2 && var1 <= 36) {
-			boolean var3 = false;
-			boolean var4 = false;
-			int var5 = 0;
-			int var6 = var0.length();
-
-			for (int var7 = 0; var7 < var6; ++var7) {
-				char var8 = var0.charAt(var7);
-				if (var7 == 0) {
-					if (var8 == '-') {
-						var3 = true;
-						continue;
-					}
-
-					if (var8 == '+') {
-						continue;
-					}
-				}
-
-				int var10;
-				if (var8 >= '0' && var8 <= '9') {
-					var10 = var8 - '0';
-				} else if (var8 >= 'A' && var8 <= 'Z') {
-					var10 = var8 - '7';
-				} else {
-					if (var8 < 'a' || var8 > 'z') {
-						throw new NumberFormatException();
-					}
-
-					var10 = var8 - 'W';
-				}
-
-				if (var10 >= var1) {
-					throw new NumberFormatException();
-				}
-
-				if (var3) {
-					var10 = -var10;
-				}
-
-				int var9 = var10 + var5 * var1;
-				if (var9 / var1 != var5) {
-					throw new NumberFormatException();
-				}
-
-				var5 = var9;
-				var4 = true;
-			}
-
-			if (!var4) {
-				throw new NumberFormatException();
-			} else {
-				return var5;
-			}
-		} else {
-			throw new IllegalArgumentException("" + var1);
-		}
-	}
 }
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/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("lq")
+@ObfuscatedName("lt")
@Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@Export("height")
 	public int height;

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@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("j")
+	@ObfuscatedName("x")
 	@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("i")
+	@ObfuscatedName("t")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}

-	@ObfuscatedName("u")
-	public void method5979(int var1, int var2, int var3, int var4) {
+	@ObfuscatedName("l")
+	public void method6059(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("k")
+	@ObfuscatedName("g")
 	@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("n")
+	@ObfuscatedName("u")
 	@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;
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -4,112 +4,112 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("dn")
+@ObfuscatedName("dw")
@Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("e")
+	@ObfuscatedName("q")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("a")
+	@ObfuscatedName("r")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("h")
+	@ObfuscatedName("m")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("m")
+	@ObfuscatedName("a")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("o")
+	@ObfuscatedName("b")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("k")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("t")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("f")
+	@ObfuscatedName("n")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("y")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Ldp;"
+		signature = "Ldl;"
 	)
 	@Export("filter")
 	AudioFilter filter;
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ldv;"
+		signature = "Ldo;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("b")
+	@ObfuscatedName("e")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@Export("offset")
 	int offset;

@@ -146,7 +146,7 @@ public class Instrument {
 		this.offset = 0;
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
 		class300.clearIntArray(Instrument_samples, 0, var1);
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}

-	@ObfuscatedName("j")
+	@ObfuscatedName("x")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}

-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lky;)V"
+		signature = "(Lkz;)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.method2637(var1, this.filterEnvelope);
+		this.filter.method2666(var1, this.filterEnvelope);
 	}
 }
--- a/runescape-client/src/main/java/IntHashTable.java
+++ b/runescape-client/src/main/java/IntHashTable.java
@@ -3,16 +3,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ly")
+@ObfuscatedName("lv")
@Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("gg")
-	@ObfuscatedSignature(
-		signature = "[Lls;"
-	)
-	@Export("headIconPrayerSprites")
-	static Sprite[] headIconPrayerSprites;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@Export("array")
 	int[] array;

@@ -38,10 +32,10 @@ public class IntHashTable {

 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IS)I",
-		garbageValue = "2215"
+		signature = "(II)I",
+		garbageValue = "-2041473369"
 	)
 	@Export("get")
 	public int get(int var1) {
--- a/Show More
+++ b/Show More